[mapguide-commits] r8712 - in trunk/Tools/Maestro: Maestro Maestro.AddIn.Local Maestro.Base/Commands/SiteExplorer Maestro.Base/Services Maestro.Editors Maestro.Editors/Common Maestro.Editors/FeatureSource/Extensions Maestro.Editors/Fusion Maestro.Editors/LayerDefinition/Vector/Scales Maestro.Editors/MapDefinition Maestro.Editors/Preview Maestro.Editors/SymbolDefinition Maestro.Editors/TileSetDefinition Maestro.Editors/TileSetDefinition/Providers OSGeo.MapGuide.MaestroAPI OSGeo.MapGuide.MaestroAPI/Capability OSGeo.MapGuide.MaestroAPI/CoordinateSystem OSGeo.MapGuide.MaestroAPI/CrossConnection OSGeo.MapGuide.MaestroAPI/Mapping OSGeo.MapGuide.MaestroAPI/Resource OSGeo.MapGuide.MaestroAPI/Resource/Conversion OSGeo.MapGuide.MaestroAPI/Resource/Validation OSGeo.MapGuide.MaestroAPI/Schema OSGeo.MapGuide.ObjectModel.Tests OSGeo.MapGuide.ObjectModels OSGeo.MapGuide.ObjectModels/ApplicationDefinition OSGeo.MapGuide.ObjectModels/Common OSGeo.MapGuide.ObjectModels/FeatureSource OSGeo.MapGuide.ObjectModels/ LayerDefinition OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0 OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0 OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0 OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0 OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0 OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0 OSGeo.MapGuide.ObjectModels/LoadProcedure OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_0_0 OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0 OSGeo.MapGuide.ObjectModels/LoadProcedure/v2_4_0 OSGeo.MapGuide.ObjectModels/MapDefinition OSGeo.MapGuide.ObjectModels/MapDefinition/v1_0_0 OSGeo.MapGuide.ObjectModels/MapDefinition/v2_3_0 OSGeo.MapGuide.ObjectModels/MapDefinition/v2_4_0 OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0 OSGeo.MapGuide.ObjectModels/SymbolDefinition OSGeo.MapGuide.ObjectModels/TileSetDefinition OSGeo.MapGuide.ObjectModels/WatermarkDefinition OSGeo.MapGuide.ObjectModels/WebLayout
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Jul 21 09:18:55 PDT 2015
Author: jng
Date: 2015-07-21 09:18:54 -0700 (Tue, 21 Jul 2015)
New Revision: 8712
Modified:
trunk/Tools/Maestro/Maestro.AddIn.Local/packages.config
trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DeleteSelectedItemsCommand.cs
trunk/Tools/Maestro/Maestro.Base/Services/ClipboardService.cs
trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs
trunk/Tools/Maestro/Maestro.Editors/Common/XmlContentErrorDialog.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/JoinSettings.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditorContext.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/FusionWidgetEditorMap.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetSettingsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs
trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ExtentCalculationDialog.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ScaleListGenerator.cs
trunk/Tools/Maestro/Maestro.Editors/Preview/DefaultResourcePreviewer.cs
trunk/Tools/Maestro/Maestro.Editors/Preview/ResourcePreviewFactory.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolField.cs
trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/Providers/GenericProviderCtrl.cs
trunk/Tools/Maestro/Maestro/
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/ConnectionCapabilities.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemBase.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CredentialWriter.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceMigrator.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceRebaser.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ExtensionMethods.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMap.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Conversion/ImageSymbolConverter.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/IResourceValidator.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLayerDefinitionValidator.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLoadProcedureValidator.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseMapDefinitionValidator.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseSymbolDefinitionValidator.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseWebLayoutValidator.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/DrawingSourceValidator.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/FeatureSourceValidator.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/PrintLayoutValidator.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ResourceValidatorSet.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/SymbolLibraryValidator.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ValidationResultSet.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/ClassDefinition.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/FeatureSourceDescription.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/PropertyDefinition.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/WeakEventHandler.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/CheckTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/ApplicationDefinitionInterfaces.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IEnvelope.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/FeatureSourceInterfaces.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/LayerDefinitionInterfaces.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0/VectorLayerDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0/VectorLayerDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0/VectorLayerDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0/VectorLayerDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0/VectorLayerDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0/VectorLayerDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/LoadProcedureInterfaces.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_0_0/LoadProcedureImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0/LoadProcedureImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v2_4_0/LoadProcedureImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/MapDefinitionInterfaces.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v1_0_0/MapDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_3_0/MapDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_4_0/MapDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0/MapDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ObjectFactory.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypeDescriptor.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/SymbolDefinitionInterfaces.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/TileSetDefinition/TileSetInterfaces.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/WatermarkCollectionUtil.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/WebLayoutInterfaces.cs
Log:
#2565: First post VS 2015 release submission:
- Fix duplicate packages in packages.config for Maestro.AddIn.Local
- Replace string literals in various Check validations with the new nameof() operator
- Use the new string interpolation feature in place of some string.Format() calls
Property changes on: trunk/Tools/Maestro/Maestro
___________________________________________________________________
Modified: svn:ignore
- Maestro.suo
obj
*.user
*.cache
*.suo
+ Maestro.suo
obj
*.user
*.cache
*.suo
.vs
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/packages.config 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/packages.config 2015-07-21 16:18:54 UTC (rev 8712)
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="mapguide-api-base-x86" version="2.5.2.7949" targetFramework="net40" />
<package id="mapguide-api-base-x86" version="2.6.0.8316" targetFramework="net45" />
- <package id="mg-desktop-net40-x86" version="2.5.2.7949" targetFramework="net40" />
- <package id="mg-desktop-viewer-net40-x86" version="2.5.2.7949" targetFramework="net40" />
<package id="mg-desktop-viewer-x86" version="2.6.0.8316" targetFramework="net45" />
<package id="mg-desktop-x86" version="2.6.0.8316" targetFramework="net45" />
</packages>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DeleteSelectedItemsCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DeleteSelectedItemsCommand.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DeleteSelectedItemsCommand.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -131,8 +131,8 @@
private static bool ConfirmDeleteOpenResources(RepositoryItem[] items, Maestro.Base.Editor.IEditorViewContent[] editors)
{
- Check.ArgumentNotNull(items, "items"); //NOXLATE
- Check.ArgumentNotNull(editors, "editors"); //NOXLATE
+ Check.ArgumentNotNull(items, nameof(items));
+ Check.ArgumentNotNull(editors, nameof(editors));
Dictionary<string, string> resIds = new Dictionary<string, string>();
foreach (var item in items)
{
Modified: trunk/Tools/Maestro/Maestro.Base/Services/ClipboardService.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/ClipboardService.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/Maestro.Base/Services/ClipboardService.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -61,7 +61,7 @@
/// <param name="item"></param>
public void Put(object item)
{
- Check.ArgumentNotNull(item, "item"); //NOXLATE
+ Check.ArgumentNotNull(item, nameof(item));
lock (_clipLock)
{
_item = item;
@@ -87,7 +87,7 @@
internal RepositoryItem.ClipboardAction GetClipboardState(string resId)
{
- Check.ArgumentNotEmpty(resId, "resId");
+ Check.ArgumentNotEmpty(resId, nameof(resId));
var state = RepositoryItem.ClipboardAction.None;
object o = null;
lock (_clipLock)
Modified: trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -132,10 +132,10 @@
internal void RenameResourceId(string oldId, string newId, IServerConnection conn, ISiteExplorer siteExp)
{
- Check.ArgumentNotEmpty(oldId, "oldId"); //NOXLATE
- Check.ArgumentNotEmpty(newId, "newId"); //NOXLATE
- Check.ArgumentNotNull(siteExp, "siteExp"); //NOXLATE
- Check.ArgumentNotNull(conn, "conn"); //NOXLATE
+ Check.ArgumentNotEmpty(oldId, nameof(oldId));
+ Check.ArgumentNotEmpty(newId, nameof(newId));
+ Check.ArgumentNotNull(siteExp, nameof(siteExp));
+ Check.ArgumentNotNull(conn, nameof(conn));
string oldKey = ComputeResourceKey(oldId, conn);
string newKey = ComputeResourceKey(newId, conn);
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/XmlContentErrorDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/XmlContentErrorDialog.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/XmlContentErrorDialog.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -91,7 +91,7 @@
/// <param name="ex"></param>
public static void Show(Exception ex)
{
- Check.ArgumentNotNull(ex, "ex"); //NOXLATE
+ Check.ArgumentNotNull(ex, nameof(ex));
Check.ArgumentNotNull(ex.Data[Utility.XML_EXCEPTION_KEY], "ex.Data[Utility.XML_EXCEPTION_KEY]"); //NOXLATE
string origXmlContent = ex.Data[Utility.XML_EXCEPTION_KEY].ToString();
var diag = new XmlContentErrorDialog();
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/JoinSettings.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/JoinSettings.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/JoinSettings.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -54,9 +54,9 @@
public JoinSettings(string primaryFeatureSource, string primaryClass, IAttributeRelation rel)
: this()
{
- Check.ArgumentNotNull(rel, "rel"); //NOXLATE
- Check.ArgumentNotNull(primaryClass, "primaryClass"); //NOXLATE
- Check.ArgumentNotNull(primaryFeatureSource, "primaryFeatureSource"); //NOXLATE
+ Check.ArgumentNotNull(rel, nameof(rel));
+ Check.ArgumentNotNull(primaryClass, nameof(primaryClass));
+ Check.ArgumentNotNull(primaryFeatureSource, nameof(primaryFeatureSource));
_primaryFeatureSource = primaryFeatureSource;
_primaryClass = primaryClass;
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditorContext.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditorContext.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditorContext.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -59,7 +59,7 @@
/// <returns></returns>
public IWidgetInfo GetWidgetInfo(string name)
{
- Check.ArgumentNotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotEmpty(name, nameof(name));
foreach (var wgt in _widgetSet.WidgetInfo)
{
if (name.Equals(wgt.Type))
@@ -84,7 +84,7 @@
/// <returns></returns>
public IApplicationDefinitionContainerInfo GetContainerInfo(string name)
{
- Check.ArgumentNotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotEmpty(name, nameof(name));
foreach (var cnt in _containerSet.ContainerInfo)
{
if (name.Equals(cnt.Type))
@@ -100,7 +100,7 @@
/// <returns></returns>
public IApplicationDefinitionTemplateInfo GetTemplateInfo(string name)
{
- Check.ArgumentNotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotEmpty(name, nameof(name));
foreach (var tpl in _templateSet.TemplateInfo)
{
if (name.Equals(tpl.Name))
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/FusionWidgetEditorMap.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/FusionWidgetEditorMap.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/FusionWidgetEditorMap.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -41,9 +41,9 @@
/// <returns></returns>
public static IWidgetEditor GetEditorForWidget(IWidget widget, FlexibleLayoutEditorContext context, IEditorService edsvc)
{
- Check.ArgumentNotNull(widget, "widget"); //NOXLATE
- Check.ArgumentNotNull(context, "context"); //NOXLATE
- Check.ArgumentNotNull(edsvc, "edsvc"); //NOXLATE
+ Check.ArgumentNotNull(widget, nameof(widget));
+ Check.ArgumentNotNull(context, nameof(context));
+ Check.ArgumentNotNull(edsvc, nameof(edsvc));
IWidgetEditor ed = new GenericWidgetCtrl();
ed.Setup(widget, context, edsvc);
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetSettingsCtrl.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetSettingsCtrl.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -213,7 +213,7 @@
private TreeNode CreateNode(IUIItem item)
{
- Check.ArgumentNotNull(item, "item"); //NOXLATE
+ Check.ArgumentNotNull(item, nameof(item));
var node = new TreeNode();
switch (item.Function)
{
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -700,7 +700,7 @@
private Control CreateSymbolDefinitionEditor(ISymbolInstance symRef)
{
- Check.ArgumentNotNull(symRef, "symRef"); //NOXLATE
+ Check.ArgumentNotNull(symRef, nameof(symRef));
if (symRef.Reference.Type == SymbolInstanceType.Reference)
{
return new ReferenceCtrl((ISymbolInstanceReferenceLibrary)symRef.Reference, _edSvc);
Modified: trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj 2015-07-21 16:18:54 UTC (rev 8712)
@@ -80,9 +80,7 @@
<Compile Include="..\Properties\SignedAssemblyInfo2.cs">
<Link>SignedAssemblyInfo2.cs</Link>
</Compile>
- <Compile Include="Common\AutoCompletion.cs">
- <SubType>Component</SubType>
- </Compile>
+ <Compile Include="Common\AutoCompletion.cs" />
<Compile Include="Common\ColorComboBox.cs">
<SubType>Component</SubType>
</Compile>
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ExtentCalculationDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ExtentCalculationDialog.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ExtentCalculationDialog.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -153,7 +153,7 @@
layers.Add(ldfId, (ILayerDefinition)resSvc.GetResource(ldfId));
}
- Check.ArgumentNotNull(layers, "layers");
+ Check.ArgumentNotNull(layers, nameof(layers));
int processed = 0;
//Begin
@@ -205,8 +205,8 @@
private string ExtentsToString(IEnvelope env)
{
- Check.ArgumentNotNull(env, "env");
- return string.Format("[{0} {1}] [{2} {3}]", env.MinX, env.MinY, env.MaxX, env.MaxY);
+ Check.ArgumentNotNull(env, nameof(env));
+ return $"[{env.MinX} {env.MinY}] [{env.MaxX} {env.MaxY}]";
}
private void bgCalculation_ProgressChanged(object sender, ProgressChangedEventArgs e)
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -1255,8 +1255,8 @@
private static string GenerateLayerName(string layerId, IMapDefinition baseMapDef)
{
- Check.ArgumentNotNull(baseMapDef, "baseMapDef");
- Check.ArgumentNotEmpty(layerId, "layerId");
+ Check.ArgumentNotNull(baseMapDef, nameof(baseMapDef));
+ Check.ArgumentNotEmpty(layerId, nameof(layerId));
int counter = 0;
string prefix = ResourceIdentifier.GetName(layerId);
@@ -1276,8 +1276,8 @@
private static string GenerateBaseLayerName(string layerId, IBaseMapDefinition baseMapDef)
{
- Check.ArgumentNotNull(baseMapDef, "baseMapDef");
- Check.ArgumentNotEmpty(layerId, "layerId");
+ Check.ArgumentNotNull(baseMapDef, nameof(baseMapDef));
+ Check.ArgumentNotEmpty(layerId, nameof(layerId));
int counter = 0;
string prefix = ResourceIdentifier.GetName(layerId);
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ScaleListGenerator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ScaleListGenerator.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ScaleListGenerator.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -44,11 +44,9 @@
{
public static double[] GenerateScales(double minScale, double maxScale, ScaleGenerationMethod method, ScaleRoundingMethod rounding, int scaleCount)
{
- Check.ThatPreconditionIsMet(minScale < maxScale, "minScale < maxScale");
- Check.ThatPreconditionIsMet(scaleCount > 0, "scaleCount > 0");
-
+ Check.ThatPreconditionIsMet(minScale < maxScale, $"{nameof(minScale)} < {nameof(maxScale)}");
+ Check.ThatPreconditionIsMet(scaleCount > 0, $"{nameof(scaleCount)} > 0");
List<double> vals = new List<double>();
-
if (method == ScaleGenerationMethod.Linear)
{
double inc = (double)(maxScale - minScale) / (double)scaleCount;
Modified: trunk/Tools/Maestro/Maestro.Editors/Preview/DefaultResourcePreviewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Preview/DefaultResourcePreviewer.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/Maestro.Editors/Preview/DefaultResourcePreviewer.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -175,8 +175,8 @@
/// <returns></returns>
public bool IsPreviewable(IResource res, IServerConnection conn)
{
- Check.ArgumentNotNull(res, "res"); //NOXLATE
- Check.ArgumentNotNull(conn, "conn"); //NOXLATE
+ Check.ArgumentNotNull(res, nameof(res));
+ Check.ArgumentNotNull(conn, nameof(conn));
var rt = res.ResourceType;
if (conn.Capabilities.SupportsResourcePreviews)
Modified: trunk/Tools/Maestro/Maestro.Editors/Preview/ResourcePreviewFactory.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Preview/ResourcePreviewFactory.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/Maestro.Editors/Preview/ResourcePreviewFactory.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -62,8 +62,8 @@
/// <returns></returns>
public static bool IsPreviewable(IServerConnection conn, IResource resource)
{
- Check.ArgumentNotNull(conn, "conn"); //NOXLATE
- Check.ArgumentNotNull(resource, "resource"); //NOXLATE
+ Check.ArgumentNotNull(conn, nameof(conn));
+ Check.ArgumentNotNull(resource, nameof(resource));
var preview = GetPreviewer(conn.ProviderName);
if (preview != null)
return preview.IsPreviewable(resource, conn);
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolField.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolField.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolField.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -318,8 +318,8 @@
/// <param name="propertyName">Name of the property.</param>
public void Bind(object dataSource, string propertyName)
{
- Check.ArgumentNotNull(dataSource, "dataSource");
- Check.ArgumentNotEmpty(propertyName, "member");
+ Check.ArgumentNotNull(dataSource, nameof(dataSource));
+ Check.ArgumentNotEmpty(propertyName, nameof(propertyName));
try
{
_isBinding = true;
Modified: trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -1,23 +1,23 @@
-#region Disclaimer / License
-
-// Copyright (C) 2015, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
+#region Disclaimer / License
+
+// Copyright (C) 2015, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
#endregion Disclaimer / License
using System;
using System.Collections.Generic;
@@ -682,8 +682,8 @@
private static string GenerateBaseLayerName(string layerId, ITileSetDefinition tileSet)
{
- Check.ArgumentNotNull(tileSet, "baseMapDef");
- Check.ArgumentNotEmpty(layerId, "layerId");
+ Check.ArgumentNotNull(tileSet, nameof(tileSet));
+ Check.ArgumentNotEmpty(layerId, nameof(layerId));
int counter = 0;
string prefix = ResourceIdentifier.GetName(layerId);
Modified: trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/Providers/GenericProviderCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/Providers/GenericProviderCtrl.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/Providers/GenericProviderCtrl.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -1,23 +1,23 @@
-#region Disclaimer / License
-
-// Copyright (C) 2015, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
+#region Disclaimer / License
+
+// Copyright (C) 2015, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
#endregion Disclaimer / License
using System;
using System.Collections.Generic;
@@ -48,8 +48,8 @@
public GenericProviderCtrl(TileProvider provider, ITileSetDefinition tsd, Action resourceChangeHandler)
: this()
{
- Check.ArgumentNotNull(provider, "provider");
- Check.ArgumentNotNull(tsd, "tsd");
+ Check.ArgumentNotNull(provider, nameof(provider));
+ Check.ArgumentNotNull(tsd, nameof(tsd));
_tsd = tsd;
_provider = provider;
_resourceChangeHandler = resourceChangeHandler;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/ConnectionCapabilities.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/ConnectionCapabilities.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/ConnectionCapabilities.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -287,7 +287,7 @@
/// <returns></returns>
public virtual bool IsSupportedResourceType(string resourceType)
{
- Check.ArgumentNotEmpty(resourceType, "resourceType"); //NOXLATE
+ Check.ArgumentNotEmpty(resourceType, nameof(resourceType));
return Array.IndexOf(this.SupportedResourceTypes, resourceType) >= 0;
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemBase.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemBase.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -43,13 +43,13 @@
public static CoordinateSystemBase Create(CoordinateSystemDefinitionBase csDef)
{
- Check.ArgumentNotNull(csDef, "csDef");
+ Check.ArgumentNotNull(csDef, nameof(csDef));
return Create(csDef.WKT);
}
public static CoordinateSystemBase Create(string csWkt)
{
- Check.ArgumentNotEmpty(csWkt, "csWkt");
+ Check.ArgumentNotEmpty(csWkt, nameof(csWkt));
return Create(_csFact.CreateFromWkt(csWkt));
}
@@ -93,7 +93,7 @@
/// <returns>The scale</returns>
public double CalculateScale(ObjCommon.IEnvelope bbox, System.Drawing.Size size)
{
- Check.ArgumentNotNull(bbox, "bbox");
+ Check.ArgumentNotNull(bbox, nameof(bbox));
return CalculateScale(new Envelope(bbox.MinX, bbox.MaxX, bbox.MinY, bbox.MaxY), size);
}
@@ -114,7 +114,7 @@
/// <returns>A bounding box with the correct ratio</returns>
public ObjCommon.IEnvelope AdjustBoundingBox(ObjCommon.IEnvelope bbox, double scale, System.Drawing.Size size)
{
- Check.ArgumentNotNull(bbox, "bbox");
+ Check.ArgumentNotNull(bbox, nameof(bbox));
var env = AdjustBoundingBox(new Envelope(bbox.MinX, bbox.MaxX, bbox.MinY, bbox.MaxY), scale, size);
return OSGeo.MapGuide.ObjectModels.ObjectFactory.CreateEnvelope(env.MinX, env.MinY, env.MaxX, env.MaxY);
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CredentialWriter.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CredentialWriter.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CredentialWriter.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -45,7 +45,7 @@
/// <param name="password"></param>
public static void SetEncryptedCredentials(this IFeatureSource fs, IServerConnection conn, string username, string password)
{
- Check.ArgumentNotNull(fs, "fs"); //NOXLATE
+ Check.ArgumentNotNull(fs, nameof(fs));
if (string.IsNullOrEmpty(fs.ResourceID))
throw new ArgumentException(Strings.ErrorNoResourceIdAttached);
using (var stream = CredentialWriter.Write(username, password))
@@ -62,7 +62,7 @@
/// <returns></returns>
public static string GetEncryptedUsername(this IFeatureSource fs, IServerConnection conn)
{
- Check.ArgumentNotNull(fs, "fs"); //NOXLATE
+ Check.ArgumentNotNull(fs, nameof(fs));
var resData = conn.ResourceService.EnumerateResourceData(fs.ResourceID);
foreach (var rd in resData.ResourceData)
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceMigrator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceMigrator.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceMigrator.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -79,8 +79,8 @@
/// <param name="target">The target.</param>
public ResourceMigrator(IServerConnection source, IServerConnection target)
{
- Check.ArgumentNotNull(source, "source"); //NOXLATE
- Check.ArgumentNotNull(target, "target"); //NOXLATE
+ Check.ArgumentNotNull(source, nameof(source));
+ Check.ArgumentNotNull(target, nameof(target));
_source = source;
_target = target;
_converter = new ResourceObjectConverter();
@@ -97,9 +97,9 @@
/// <returns></returns>
public string[] CopyResources(string[] sourceResourceIds, string[] targetResourceIds, bool overwrite, RebaseOptions options, LengthyOperationProgressCallBack callback)
{
- Check.ArgumentNotNull(sourceResourceIds, "sourceResourceIds"); //NOXLATE
- Check.ArgumentNotNull(targetResourceIds, "targetResourceIds"); //NOXLATE
- Check.ThatPreconditionIsMet(sourceResourceIds.Length == targetResourceIds.Length, "resourceIds.Length == targetResourceIds.Length"); //NOXLATE
+ Check.ArgumentNotNull(sourceResourceIds, nameof(sourceResourceIds));
+ Check.ArgumentNotNull(targetResourceIds, nameof(targetResourceIds));
+ Check.ThatPreconditionIsMet(sourceResourceIds.Length == targetResourceIds.Length, $"{nameof(sourceResourceIds)}.Length == {nameof(targetResourceIds)}.Length");
var copiedItems = new List<string>();
var cb = callback;
@@ -196,8 +196,8 @@
/// <returns></returns>
public int CopyResources(string[] resourceIds, string folderId, bool overwrite, LengthyOperationProgressCallBack callback)
{
- Check.ArgumentNotNull(resourceIds, "resourceIds"); //NOXLATE
- Check.ArgumentNotEmpty(folderId, "folderId"); //NOXLATE
+ Check.ArgumentNotNull(resourceIds, nameof(resourceIds));
+ Check.ArgumentNotEmpty(folderId, nameof(folderId));
var cb = callback;
if (cb == null)
@@ -279,8 +279,8 @@
/// <returns></returns>
public int MoveResources(string[] resourceIds, string folderId, bool overwrite, LengthyOperationProgressCallBack callback)
{
- Check.ArgumentNotNull(resourceIds, "resourceIds"); //NOXLATE
- Check.ArgumentNotEmpty(folderId, "folderId"); //NOXLATE
+ Check.ArgumentNotNull(resourceIds, nameof(resourceIds));
+ Check.ArgumentNotEmpty(folderId, nameof(folderId));
var cb = callback;
if (cb == null)
@@ -363,8 +363,8 @@
/// <returns>An array of resource ids that were succesfully migrated</returns>
public string[] MigrateResource(string resourceId, string[] dependentResourceIds, bool overwrite, LengthyOperationProgressCallBack callback)
{
- Check.ArgumentNotEmpty(resourceId, "resourceId"); //NOXLATE
- Check.ArgumentNotNull(dependentResourceIds, "dependentResourceIds"); //NOXLATE
+ Check.ArgumentNotEmpty(resourceId, nameof(resourceId));
+ Check.ArgumentNotNull(dependentResourceIds, nameof(dependentResourceIds));
//TODO: Figure out a more elegant strategy of handling saving resources
//to older versions (downgrading?)
@@ -494,7 +494,7 @@
/// <returns>An array of resource ids that were succesfully migrated</returns>
public string[] MigrateResource(string resourceId, bool overwrite, LengthyOperationProgressCallBack callback)
{
- Check.ArgumentNotEmpty(resourceId, "resourceId"); //NOXLATE
+ Check.ArgumentNotEmpty(resourceId, nameof(resourceId));
Dictionary<string, string> resIds = new Dictionary<string, string>();
var refList = GetReverseReferences(resourceId);
BuildFullDependencyList(resIds, refList);
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceRebaser.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceRebaser.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceRebaser.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -39,8 +39,8 @@
/// <param name="targetFolder">The target folder.</param>
public RebaseOptions(string sourceFolder, string targetFolder)
{
- Check.ThatPreconditionIsMet(ResourceIdentifier.IsFolderResource(sourceFolder), "ResourceIdentifier.IsFolderResource(sourceFolder)"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.IsFolderResource(targetFolder), "ResourceIdentifier.IsFolderResource(targetFolder)"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.IsFolderResource(sourceFolder), $"{nameof(ResourceIdentifier)}.{nameof(ResourceIdentifier.IsFolderResource)}({nameof(sourceFolder)})");
+ Check.ThatPreconditionIsMet(ResourceIdentifier.IsFolderResource(targetFolder), $"{nameof(ResourceIdentifier)}.{nameof(ResourceIdentifier.IsFolderResource)}({nameof(targetFolder)})");
this.SourceFolder = sourceFolder;
this.TargetFolder = targetFolder;
@@ -89,7 +89,7 @@
/// <param name="res">The res.</param>
public ResourceRebaser(IResource res)
{
- Check.ArgumentNotNull(res, "res");
+ Check.ArgumentNotNull(res, nameof(res));
_res = res;
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ExtensionMethods.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ExtensionMethods.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ExtensionMethods.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -73,7 +73,7 @@
/// <returns></returns>
public static string ToXmlString(this XmlDocument doc, bool indent = false)
{
- Check.ArgumentNotNull(doc, "doc"); //NOXLATE
+ Check.ArgumentNotNull(doc, nameof(doc));
var xs = new XmlWriterSettings();
xs.Indent = indent;
using (var sw = new StringWriter())
@@ -105,9 +105,9 @@
/// <param name="target">The target.</param>
public static void CopyResourceDataTo(this IResource source, IServerConnection conn, IResource target)
{
- Check.ArgumentNotNull(source, "source"); //NOXLATE
- Check.ArgumentNotNull(conn, "conn"); //NOXLATE
- Check.ArgumentNotNull(target, "target"); //NOXLATE
+ Check.ArgumentNotNull(source, nameof(source));
+ Check.ArgumentNotNull(conn, nameof(conn));
+ Check.ArgumentNotNull(target, nameof(target));
var resData = conn.ResourceService.EnumerateResourceData(source.ResourceID);
foreach (var res in resData.ResourceData)
@@ -137,8 +137,8 @@
/// <param name="targetID">The target ID.</param>
public static void CopyResourceDataTo(this IResource source, IServerConnection conn, string targetID)
{
- Check.ArgumentNotNull(source, "source"); //NOXLATE
- Check.ArgumentNotEmpty(targetID, "targetID"); //NOXLATE
+ Check.ArgumentNotNull(source, nameof(source));
+ Check.ArgumentNotEmpty(targetID, nameof(targetID));
var resData = conn.ResourceService.EnumerateResourceData(source.ResourceID);
foreach (var res in resData.ResourceData)
@@ -167,8 +167,8 @@
/// <returns></returns>
public static string GetConfigurationContent(this IFeatureSource fs, IServerConnection conn)
{
- Check.ArgumentNotNull(fs, "fs"); //NOXLATE
- Check.ArgumentNotNull(conn, "conn"); //NOXLATE
+ Check.ArgumentNotNull(fs, nameof(fs));
+ Check.ArgumentNotNull(conn, nameof(conn));
if (string.IsNullOrEmpty(fs.ConfigurationDocument))
return string.Empty;
@@ -190,8 +190,8 @@
/// <param name="xmlContent"></param>
public static void SetConfigurationContent(this IFeatureSource fs, IServerConnection conn, string xmlContent)
{
- Check.ArgumentNotNull(fs, "fs"); //NOXLATE
- Check.ArgumentNotNull(conn, "conn"); //NOXLATE
+ Check.ArgumentNotNull(fs, nameof(fs));
+ Check.ArgumentNotNull(conn, nameof(conn));
if (string.IsNullOrEmpty(fs.ConfigurationDocument))
fs.ConfigurationDocument = "config.xml"; //NOXLATE
@@ -229,8 +229,8 @@
/// <returns></returns>
public static string[] GetIdentityProperties(this IFeatureSource fs, IServerConnection conn, string className)
{
- Check.ArgumentNotNull(fs, "fs"); //NOXLATE
- Check.ArgumentNotNull(conn, "conn"); //NOXLATE
+ Check.ArgumentNotNull(fs, nameof(fs));
+ Check.ArgumentNotNull(conn, nameof(conn));
try
{
return conn.FeatureService.GetIdentityProperties(fs.ResourceID, className);
@@ -264,9 +264,9 @@
/// <returns>True if sheets were regenerated. False otherwise</returns>
public static bool RegenerateSheetList(this IDrawingSource source, IServerConnection conn)
{
- Check.ArgumentNotNull(source, "source"); //NOXLATE
- Check.ArgumentNotNull(conn, "conn"); //NOXLATE
- Check.ArgumentNotEmpty(source.ResourceID, "source.ResourceID"); //NOXLATE
+ Check.ArgumentNotNull(source, nameof(source));
+ Check.ArgumentNotNull(conn, nameof(conn));
+ Check.ArgumentNotEmpty(source.ResourceID, $"{nameof(source)}.{nameof(source.ResourceID)}");
IDrawingService dwSvc = (IDrawingService)conn.GetService((int)ServiceType.Drawing);
var sheets = dwSvc.EnumerateDrawingSections(source.ResourceID);
@@ -289,9 +289,9 @@
/// <param name="conn"></param>
public static void UpdateExtents(this IDrawingSource source, IServerConnection conn)
{
- Check.ArgumentNotNull(source, "source"); //NOXLATE
- Check.ArgumentNotNull(conn, "conn"); //NOXLATE
- Check.ArgumentNotEmpty(source.ResourceID, "source.ResourceID"); //NOXLATE
+ Check.ArgumentNotNull(source, nameof(source));
+ Check.ArgumentNotNull(conn, nameof(conn));
+ Check.ArgumentNotEmpty(source.ResourceID, $"{nameof(source)}.{nameof(source.ResourceID)}");
//Need drawing service
if (Array.IndexOf(conn.Capabilities.SupportedServices, (int)ServiceType.Drawing) < 0)
@@ -376,8 +376,8 @@
/// <returns></returns>
public static IFdoSpatialContext GetSpatialContext(this ILayerDefinition layer, IServerConnection conn)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
- Check.ArgumentNotNull(conn, "conn"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
+ Check.ArgumentNotNull(conn, nameof(conn));
var ltype = layer.SubLayer.LayerType;
if (ltype == LayerType.Vector ||
ltype == LayerType.Raster)
@@ -433,8 +433,8 @@
public static IEnvelope GetSpatialExtent(this ILayerDefinition layer, IServerConnection conn, bool allowFallbackToContextInformation, out string csWkt)
{
csWkt = null;
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
- Check.ArgumentNotNull(conn, "conn"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
+ Check.ArgumentNotNull(conn, nameof(conn));
switch (layer.SubLayer.LayerType)
{
@@ -552,7 +552,7 @@
/// <returns></returns>
public static ICompositeRule CreateDefaultPointCompositeRule(this ILayerElementFactory fact)
{
- Check.ArgumentNotNull(fact, "fact");
+ Check.ArgumentNotNull(fact, nameof(fact));
var rule = fact.CreateDefaultCompositeRule();
//Clear out existing instances
rule.CompositeSymbolization.RemoveAllSymbolInstances();
@@ -608,7 +608,7 @@
/// <returns></returns>
public static ICompositeRule CreateDefaultLineCompositeRule(this ILayerElementFactory fact)
{
- Check.ArgumentNotNull(fact, "fact");
+ Check.ArgumentNotNull(fact, nameof(fact));
var rule = fact.CreateDefaultCompositeRule();
//Clear out existing instances
rule.CompositeSymbolization.RemoveAllSymbolInstances();
@@ -659,7 +659,7 @@
/// <returns></returns>
public static ICompositeRule CreateDefaultAreaCompositeRule(this ILayerElementFactory fact)
{
- Check.ArgumentNotNull(fact, "fact");
+ Check.ArgumentNotNull(fact, nameof(fact));
var rule = fact.CreateDefaultCompositeRule();
//Clear out existing instances
rule.CompositeSymbolization.RemoveAllSymbolInstances();
@@ -736,7 +736,7 @@
/// <returns></returns>
public static ICompositeTypeStyle CreateDefaultPointCompositeStyle(this ILayerElementFactory fact)
{
- Check.ArgumentNotNull(fact, "fact");
+ Check.ArgumentNotNull(fact, nameof(fact));
var style = fact.CreateDefaultCompositeStyle();
style.RemoveAllRules();
style.AddCompositeRule(fact.CreateDefaultPointCompositeRule());
@@ -750,7 +750,7 @@
/// <returns></returns>
public static ICompositeTypeStyle CreateDefaultLineCompositeStyle(this ILayerElementFactory fact)
{
- Check.ArgumentNotNull(fact, "fact");
+ Check.ArgumentNotNull(fact, nameof(fact));
var style = fact.CreateDefaultCompositeStyle();
style.RemoveAllRules();
style.AddCompositeRule(fact.CreateDefaultLineCompositeRule());
@@ -764,7 +764,7 @@
/// <returns></returns>
public static ICompositeTypeStyle CreateDefaultAreaCompositeStyle(this ILayerElementFactory fact)
{
- Check.ArgumentNotNull(fact, "fact");
+ Check.ArgumentNotNull(fact, nameof(fact));
var style = fact.CreateDefaultCompositeStyle();
style.RemoveAllRules();
style.AddCompositeRule(fact.CreateDefaultAreaCompositeRule());
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMap.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMap.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMap.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -273,9 +273,9 @@
internal RuntimeMap(IServerConnection conn, IMapDefinition mdf, double metersPerUnit, bool suppressErrors)
: this(conn)
{
- Check.ArgumentNotNull(conn, "conn"); //NOXLATE
- Check.ArgumentNotNull(mdf, "mdf"); //NOXLATE
- Check.ArgumentNotNull(mdf.ResourceID, "mdf.ResourceID"); //NOXLATE
+ Check.ArgumentNotNull(conn, nameof(conn));
+ Check.ArgumentNotNull(mdf, nameof(mdf));
+ Check.ArgumentNotNull(mdf.ResourceID, $"{nameof(mdf)}.{nameof(mdf.ResourceID)}");
this.MetersPerUnit = metersPerUnit;
this.MapDefinition = mdf.ResourceID;
@@ -1128,7 +1128,7 @@
[Obsolete("Use the indexer of the Groups property instead")] //NOXLATE
public RuntimeMapGroup GetGroupByName(string name)
{
- Check.ArgumentNotNull(name, "name"); //NOXLATE
+ Check.ArgumentNotNull(name, nameof(name));
return this.Groups[name];
}
@@ -1172,7 +1172,7 @@
/// <returns></returns>
public int IndexOfLayer(string layerName)
{
- Check.ArgumentNotEmpty(layerName, "layerName"); //NOXLATE
+ Check.ArgumentNotEmpty(layerName, nameof(layerName));
var layer = this.Layers[layerName];
return this.Layers.IndexOf(layer);
@@ -1215,7 +1215,7 @@
/// <returns></returns>
public RuntimeMapLayer[] GetLayersOfGroup(string groupName)
{
- Check.ArgumentNotEmpty(groupName, "groupName"); //NOXLATE
+ Check.ArgumentNotEmpty(groupName, nameof(groupName));
List<RuntimeMapLayer> layers = new List<RuntimeMapLayer>();
foreach (var lyr in this.Layers)
{
@@ -1232,7 +1232,7 @@
/// <returns></returns>
public RuntimeMapGroup[] GetGroupsOfGroup(string groupName)
{
- Check.ArgumentNotEmpty(groupName, "groupName"); //NOXLATE
+ Check.ArgumentNotEmpty(groupName, nameof(groupName));
List<RuntimeMapGroup> groups = new List<RuntimeMapGroup>();
foreach (var grp in this.Groups)
{
@@ -1262,9 +1262,9 @@
private void Save(string resourceID)
{
- Check.ArgumentNotNull(resourceID, "resourceID");
- Check.ArgumentNotEmpty(resourceID, "resourceID");
- Check.ThatPreconditionIsMet(resourceID.EndsWith(".Map"), "resourceID.EndsWith(\".Map\")");
+ Check.ArgumentNotNull(resourceID, nameof(resourceID));
+ Check.ArgumentNotEmpty(resourceID, nameof(ResourceID));
+ Check.ThatPreconditionIsMet(resourceID.EndsWith(".Map"), $"{nameof(resourceID)}.EndsWith(\".Map\")"); //NOXLATE
var map = this;
string selectionID = resourceID.Substring(0, resourceID.LastIndexOf(".")) + ".Selection"; //NOXLATE
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -75,7 +75,7 @@
/// <returns></returns>
public static RuntimeMapGroup GetParentGroup(this RuntimeMapLayer layer)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
if (string.IsNullOrEmpty(layer.Group))
return null;
@@ -131,7 +131,7 @@
/// <param name="suppressErrors"></param>
protected void Initialize(ILayerDefinition ldf, bool suppressErrors)
{
- Check.ArgumentNotNull(ldf, "ldf"); //NOXLATE
+ Check.ArgumentNotNull(ldf, nameof(ldf));
this.LayerDefinitionID = ldf.ResourceID;
if (ldf.SubLayer.LayerType == LayerType.Vector)
{
@@ -278,9 +278,9 @@
protected internal RuntimeMapLayer(RuntimeMap parent, IBaseMapLayer source, ILayerDefinition ldf, bool suppressErrors)
: this(parent, ldf, suppressErrors)
{
- Check.ArgumentNotNull(source, "source"); //NOXLATE
- Check.ArgumentNotNull(ldf, "ldf"); //NOXLATE
- Check.ThatPreconditionIsMet(source.ResourceId == ldf.ResourceID, "source.ResourceId == ldf.ResourceID"); //NOXLATE
+ Check.ArgumentNotNull(source, nameof(source));
+ Check.ArgumentNotNull(ldf, nameof(ldf));
+ Check.ThatPreconditionIsMet(source.ResourceId == ldf.ResourceID, $"{nameof(source)}.{nameof(source.ResourceId)} == {nameof(ldf)}.{nameof(ldf.ResourceID)}");
}
private void EnsureOrderedMinMaxScales()
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -1710,8 +1710,8 @@
/// <returns></returns>
protected virtual OSGeo.MapGuide.ObjectModels.Common.IEnvelope GetSpatialExtent(string resourceID, string schema, string geometry, string filter, bool allowFallbackToContextInformation)
{
- Check.ArgumentNotEmpty(schema, "schema"); //NOXLATE
- Check.ArgumentNotEmpty(geometry, "geometry"); //NOXLATE
+ Check.ArgumentNotEmpty(schema, nameof(schema));
+ Check.ArgumentNotEmpty(geometry, nameof(geometry));
try
{
System.Collections.Specialized.NameValueCollection fun = new System.Collections.Specialized.NameValueCollection();
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Conversion/ImageSymbolConverter.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Conversion/ImageSymbolConverter.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Conversion/ImageSymbolConverter.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -61,10 +61,12 @@
/// <param name="symbolLibId"></param>
public ImageSymbolConverter(IServerConnection conn, string symbolLibId)
{
- Check.ArgumentNotNull(conn, "conn"); //NOXLATE
- Check.ArgumentNotEmpty(symbolLibId, "symbolLibId"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(symbolLibId) == ResourceTypes.SymbolLibrary.ToString(), "ResourceIdentifier.GetResourceTypeAsString(symbolLibId) == ResourceTypes.SymbolLibrary.ToString()"); //NOXLATE
- Check.ThatPreconditionIsMet(Array.IndexOf(conn.Capabilities.SupportedServices, (int)ServiceType.Drawing) >= 0, "Array.IndexOf(conn.Capabilities.SupportedServices, (int)ServiceType.Drawing) >= 0"); //NOXLATE
+ Check.ArgumentNotNull(conn, nameof(conn));
+ Check.ArgumentNotEmpty(symbolLibId, nameof(symbolLibId));
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(symbolLibId) == ResourceTypes.SymbolLibrary.ToString(),
+ "ResourceIdentifier.GetResourceTypeAsString(symbolLibId) == ResourceTypes.SymbolLibrary.ToString()"); //NOXLATE
+ Check.ThatPreconditionIsMet(Array.IndexOf(conn.Capabilities.SupportedServices, (int)ServiceType.Drawing) >= 0,
+ "Array.IndexOf(conn.Capabilities.SupportedServices, (int)ServiceType.Drawing) >= 0"); //NOXLATE
_symbolLibId = symbolLibId;
_conn = conn;
}
@@ -77,8 +79,8 @@
/// <param name="progressCallback"></param>
public void ExtractSymbols(string targetFolder, IEnumerable<string> symbols, Action<int, int> progressCallback)
{
- Check.ArgumentNotEmpty(targetFolder, "targetFolder"); //NOXLATE
- Check.ThatArgumentIsFolder(targetFolder, "targetFolder"); //NOXLATE
+ Check.ArgumentNotEmpty(targetFolder, nameof(targetFolder));
+ Check.ThatArgumentIsFolder(targetFolder, nameof(targetFolder));
if (symbols == null)
{
@@ -123,8 +125,8 @@
/// <param name="targetFolder"></param>
public void ExtractSymbols(string targetFolder)
{
- Check.ArgumentNotEmpty(targetFolder, "targetFolder"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.IsFolderResource(targetFolder), "ResourceIdentifier.IsFolderResource(targetFolder)"); //NOXLATE
+ Check.ArgumentNotEmpty(targetFolder, nameof(targetFolder));
+ Check.ThatPreconditionIsMet(ResourceIdentifier.IsFolderResource(targetFolder), $"{nameof(ResourceIdentifier)}.{nameof(ResourceIdentifier.IsFolderResource)}({nameof(targetFolder)})");
IDrawingService drawSvc = (IDrawingService)_conn.GetService((int)ServiceType.Drawing);
IDrawingSource ds = PrepareSymbolDrawingSource(_conn, _symbolLibId);
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/IResourceValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/IResourceValidator.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/IResourceValidator.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -65,8 +65,8 @@
/// <param name="msg">The message.</param>
public ValidationIssue(IResource res, ValidationStatus stat, ValidationStatusCode code, string msg)
{
- Check.ArgumentNotNull(res, "res"); //NOXLATE
- Check.ArgumentNotEmpty(msg, "msg"); //NOXLATE
+ Check.ArgumentNotNull(res, nameof(res));
+ Check.ArgumentNotEmpty(msg, nameof(msg));
this.Resource = res;
this.Status = stat;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLayerDefinitionValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLayerDefinitionValidator.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLayerDefinitionValidator.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -70,7 +70,7 @@
/// <returns></returns>
protected ValidationIssue[] ValidateBase(ResourceValidationContext context, IResource resource, bool recurse)
{
- Check.ArgumentNotNull(context, "context"); //NOXLATE
+ Check.ArgumentNotNull(context, nameof(context));
if (context.IsAlreadyValidated(resource.ResourceID))
return null;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLoadProcedureValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLoadProcedureValidator.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLoadProcedureValidator.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -46,7 +46,7 @@
/// <returns></returns>
protected static ValidationIssue[] ValidateBase(ResourceValidationContext context, IResource resource, bool recurse)
{
- Check.ArgumentNotNull(context, "context"); //NOXLATE
+ Check.ArgumentNotNull(context, nameof(context));
if (context.IsAlreadyValidated(resource.ResourceID))
return null;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseMapDefinitionValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseMapDefinitionValidator.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseMapDefinitionValidator.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -73,7 +73,7 @@
/// <returns></returns>
protected ValidationIssue[] ValidateBase(ResourceValidationContext context, IResource resource, bool recurse)
{
- Check.ArgumentNotNull(context, "context"); //NOXLATE
+ Check.ArgumentNotNull(context, nameof(context));
if (context.IsAlreadyValidated(resource.ResourceID))
return null;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseSymbolDefinitionValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseSymbolDefinitionValidator.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseSymbolDefinitionValidator.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -43,7 +43,7 @@
/// <returns></returns>
protected ValidationIssue[] ValidateBase(ResourceValidationContext context, IResource resource, bool recurse)
{
- Check.ArgumentNotNull(context, "context"); //NOXLATE
+ Check.ArgumentNotNull(context, nameof(context));
if (context.IsAlreadyValidated(resource.ResourceID))
return null;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseWebLayoutValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseWebLayoutValidator.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseWebLayoutValidator.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -53,7 +53,7 @@
/// <returns></returns>
protected static ValidationIssue[] ValidateBase(ResourceValidationContext context, IResource resource, bool recurse)
{
- Check.ArgumentNotNull(context, "context"); //NOXLATE
+ Check.ArgumentNotNull(context, nameof(context));
if (context.IsAlreadyValidated(resource.ResourceID))
return null;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/DrawingSourceValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/DrawingSourceValidator.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/DrawingSourceValidator.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -53,7 +53,7 @@
/// <returns></returns>
public ValidationIssue[] Validate(ResourceValidationContext context, IResource resource, bool recurse)
{
- Check.ArgumentNotNull(context, "context"); //NOXLATE
+ Check.ArgumentNotNull(context, nameof(context));
if (context.IsAlreadyValidated(resource.ResourceID))
return null;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/FeatureSourceValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/FeatureSourceValidator.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/FeatureSourceValidator.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -57,7 +57,7 @@
/// <returns></returns>
public ValidationIssue[] Validate(ResourceValidationContext context, IResource resource, bool recurse)
{
- Check.ArgumentNotNull(context, "context"); //NOXLATE
+ Check.ArgumentNotNull(context, nameof(context));
if (context.IsAlreadyValidated(resource.ResourceID))
return null;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/PrintLayoutValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/PrintLayoutValidator.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/PrintLayoutValidator.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -53,7 +53,7 @@
/// <returns></returns>
public ValidationIssue[] Validate(ResourceValidationContext context, IResource resource, bool recurse)
{
- Check.ArgumentNotNull(context, "context"); //NOXLATE
+ Check.ArgumentNotNull(context, nameof(context));
if (context.IsAlreadyValidated(resource.ResourceID))
return null;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ResourceValidatorSet.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ResourceValidatorSet.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ResourceValidatorSet.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -52,7 +52,7 @@
/// <param name="validator">The validator.</param>
public static void RegisterValidator(IResourceValidator validator)
{
- Check.ArgumentNotNull(validator, "validator"); //NOXLATE
+ Check.ArgumentNotNull(validator, nameof(validator));
if (!m_validators.Contains(validator))
m_validators.Add(validator);
@@ -67,7 +67,7 @@
/// <returns></returns>
public static ValidationIssue[] Validate(ResourceValidationContext context, IEnumerable<IResource> items, bool recurse)
{
- Check.ArgumentNotNull(items, "items"); //NOXLATE
+ Check.ArgumentNotNull(items, nameof(items));
var issues = new List<ValidationIssue>();
foreach (var item in items)
{
@@ -86,7 +86,7 @@
/// <returns></returns>
public static ValidationIssue[] Validate(ResourceValidationContext context, IResource item, bool recurse)
{
- Check.ArgumentNotNull(item, "item"); //NOXLATE
+ Check.ArgumentNotNull(item, nameof(item));
var issueSet = new ValidationResultSet();
if (!HasValidator(item.ResourceType, item.ResourceVersion))
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/SymbolLibraryValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/SymbolLibraryValidator.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/SymbolLibraryValidator.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -53,7 +53,7 @@
/// <returns></returns>
public ValidationIssue[] Validate(ResourceValidationContext context, IResource resource, bool recurse)
{
- Check.ArgumentNotNull(context, "context"); //NOXLATE
+ Check.ArgumentNotNull(context, nameof(context));
if (context.IsAlreadyValidated(resource.ResourceID))
return null;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ValidationResultSet.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ValidationResultSet.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ValidationResultSet.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -64,7 +64,7 @@
public ValidationResultSet(IEnumerable<ValidationIssue> issues)
: this()
{
- Check.ArgumentNotNull(issues, "issues"); //NOXLATE
+ Check.ArgumentNotNull(issues, nameof(issues));
AddIssues(issues);
}
@@ -85,7 +85,7 @@
/// <returns></returns>
public ICollection<ValidationIssue> GetIssuesForResource(string resourceId)
{
- Check.ArgumentNotEmpty(resourceId, "resourceId"); //NOXLATE
+ Check.ArgumentNotEmpty(resourceId, nameof(resourceId));
if (_issues.ContainsKey(resourceId))
return _issues[resourceId].Keys;
@@ -148,9 +148,9 @@
/// <param name="issue">The issue.</param>
public void AddIssue(ValidationIssue issue)
{
- Check.ArgumentNotNull(issue, "issue"); //NOXLATE
- Check.ArgumentNotNull(issue.Resource, "issue.Resource"); //NOXLATE
- Check.ArgumentNotEmpty(issue.Resource.ResourceID, "issue.Resource.ResourceID"); //NOXLATE
+ Check.ArgumentNotNull(issue, nameof(issue));
+ Check.ArgumentNotNull(issue.Resource, $"{nameof(issue)}.{nameof(issue.Resource)}");
+ Check.ArgumentNotEmpty(issue.Resource.ResourceID, $"{nameof(issue)}.{nameof(issue.Resource)}.{nameof(issue.Resource.ResourceID)}");
if (!_issues.ContainsKey(issue.Resource.ResourceID))
_issues[issue.Resource.ResourceID] = new Dictionary<ValidationIssue, ValidationIssue>();
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/ClassDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/ClassDefinition.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/ClassDefinition.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -58,8 +58,8 @@
public ClassDefinition(string name, string description)
: this()
{
- Check.ArgumentNotNull(name, "name"); //NOXLATE
- Check.ArgumentNotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotNull(name, nameof(name));
+ Check.ArgumentNotEmpty(name, nameof(name));
this.Name = name;
this.Description = description;
}
@@ -268,8 +268,8 @@
/// <param name="currentNode"></param>
void IFdoSerializable.WriteXml(XmlDocument doc, XmlNode currentNode)
{
- Check.ArgumentNotNull(doc, "doc"); //NOXLATE
- Check.ArgumentNotNull(currentNode, "currentNode"); //NOXLATE
+ Check.ArgumentNotNull(doc, nameof(doc));
+ Check.ArgumentNotNull(currentNode, nameof(currentNode));
XmlElement id = null;
var en = Utility.EncodeFDOName(this.Name);
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/FeatureSourceDescription.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/FeatureSourceDescription.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/FeatureSourceDescription.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -175,7 +175,7 @@
/// <returns>The matching class definition. null if not found</returns>
public ClassDefinition GetClass(string qualifiedName)
{
- Check.ArgumentNotEmpty(qualifiedName, "qualifiedName"); //NOXLATE
+ Check.ArgumentNotEmpty(qualifiedName, nameof(qualifiedName));
var tokens = qualifiedName.Split(':'); //NOXLATE
if (tokens.Length != 2)
throw new ArgumentException(string.Format(Strings.ErrorNotAQualifiedClassName, qualifiedName));
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/PropertyDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/PropertyDefinition.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/PropertyDefinition.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -235,7 +235,7 @@
/// <param name="mgr"></param>
void IFdoSerializable.ReadXml(System.Xml.XmlNode node, System.Xml.XmlNamespaceManager mgr)
{
- Check.ArgumentNotNull(node, "node"); //NOXLATE
+ Check.ArgumentNotNull(node, nameof(node));
this.ReadXml(node, mgr);
}
@@ -246,8 +246,8 @@
/// <param name="currentNode"></param>
void IFdoSerializable.WriteXml(System.Xml.XmlDocument doc, System.Xml.XmlNode currentNode)
{
- Check.ArgumentNotNull(doc, "doc"); //NOXLATE
- Check.ArgumentNotNull(currentNode, "currentNode"); //NOXLATE
+ Check.ArgumentNotNull(doc, nameof(doc));
+ Check.ArgumentNotNull(currentNode, nameof(currentNode));
this.WriteXml(doc, currentNode);
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -1531,8 +1531,8 @@
/// <returns>true if a replacement was made. false if no replacements were made</returns>
public static bool ReplaceResourceIds(XmlDocument doc, string srcId, string dstId)
{
- Check.ArgumentNotEmpty(srcId, "srcId"); //NOXLATE
- Check.ArgumentNotEmpty(dstId, "dstId"); //NOXLATE
+ Check.ArgumentNotEmpty(srcId, nameof(srcId));
+ Check.ArgumentNotEmpty(dstId, nameof(dstId));
bool changed = false;
//There's an unwritten spec that all elements that refer to a Resource ID are named "ResourceId".
//This is why this method can be relied upon to cover all resource id references.
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/WeakEventHandler.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/WeakEventHandler.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/WeakEventHandler.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -65,7 +65,7 @@
public static TEventHandler Create(TEventHandler eh, Action<TEventHandler> cleanup)
{
- Check.ThatPreconditionIsMet(eh != null && cleanup != null, "eh != null && cleanup != null");
+ Check.ThatPreconditionIsMet(eh != null && cleanup != null, $"{nameof(eh)} != null && {nameof(cleanup)} != null");
// We don't create weak events for static methods since types don't get GC'd
Delegate d = (Delegate)(Object)eh; // We know that all event handlers are derived from Delegate
if (d.Target == null) return eh;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/CheckTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/CheckTests.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/CheckTests.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -1,23 +1,23 @@
-#region Disclaimer / License
-
-// Copyright (C) 2014, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
+#region Disclaimer / License
+
+// Copyright (C) 2014, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
#endregion Disclaimer / License
using NUnit.Framework;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/ApplicationDefinitionInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/ApplicationDefinitionInterfaces.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/ApplicationDefinitionInterfaces.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -609,8 +609,8 @@
/// <returns></returns>
public static bool WidgetNameExists(this IApplicationDefinition appDef, string name)
{
- Check.ArgumentNotNull(appDef, "appDef");
- Check.ArgumentNotEmpty(name, "name");
+ Check.ArgumentNotNull(appDef, nameof(appDef));
+ Check.ArgumentNotEmpty(name, nameof(name));
return appDef.FindWidget(name) != null;
}
@@ -623,8 +623,8 @@
/// <returns></returns>
public static IWidget FindWidget(this IApplicationDefinition appDef, string name)
{
- Check.ArgumentNotNull(appDef, "appDef");
- Check.ArgumentNotEmpty(name, "name");
+ Check.ArgumentNotNull(appDef, nameof(appDef));
+ Check.ArgumentNotEmpty(name, nameof(name));
foreach (var set in appDef.WidgetSets)
{
@@ -645,8 +645,8 @@
/// <param name="deleteReferences">if set to <c>true</c> [deletes any references to the widget to be deleted].</param>
public static void RemoveWidget(this IApplicationDefinition appDef, string widgetName, bool deleteReferences)
{
- Check.ArgumentNotNull(appDef, "appDef"); //NOXLATE
- Check.ArgumentNotEmpty(widgetName, "widgetName"); //NOXLATE
+ Check.ArgumentNotNull(appDef, nameof(appDef));
+ Check.ArgumentNotEmpty(widgetName, nameof(widgetName));
IWidgetSet matchingSet = null;
IWidget matchingWidget = null;
@@ -718,8 +718,8 @@
/// <returns></returns>
public static IApplicationDefinitionContainerInfo FindContainer(this IApplicationDefinitionContainerInfoSet set, string name)
{
- Check.ArgumentNotNull(set, "set"); //NOXLATE
- Check.ArgumentNotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotNull(set, nameof(set));
+ Check.ArgumentNotEmpty(name, nameof(name));
foreach (var cnt in set.ContainerInfo)
{
@@ -737,8 +737,8 @@
/// <returns></returns>
public static IWidgetInfo FindWidget(this IApplicationDefinitionWidgetInfoSet set, string name)
{
- Check.ArgumentNotNull(set, "set"); //NOXLATE
- Check.ArgumentNotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotNull(set, nameof(set));
+ Check.ArgumentNotEmpty(name, nameof(name));
foreach (var wgt in set.WidgetInfo)
{
@@ -756,8 +756,8 @@
/// <returns></returns>
public static IApplicationDefinitionTemplateInfo FindTemplate(this IApplicationDefinitionTemplateInfoSet set, string name)
{
- Check.ArgumentNotNull(set, "set"); //NOXLATE
- Check.ArgumentNotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotNull(set, nameof(set));
+ Check.ArgumentNotEmpty(name, nameof(name));
foreach (var tpl in set.TemplateInfo)
{
@@ -775,7 +775,7 @@
/// <returns></returns>
public static IMapGroup GetGroupById(this IMapSet set, string id)
{
- Check.ArgumentNotNull(set, "set"); //NOXLATE
+ Check.ArgumentNotNull(set, nameof(set));
foreach (var group in set.MapGroups)
{
if (group.id.Equals(id))
@@ -791,7 +791,7 @@
/// <returns></returns>
public static string[] GetNames(this IExtensibleElement ext)
{
- Check.ArgumentNotNull(ext, "ext"); //NOXLATE
+ Check.ArgumentNotNull(ext, nameof(ext));
List<string> names = new List<string>();
@@ -810,7 +810,7 @@
/// <returns></returns>
public static NameValueCollection GetAllValues(this IExtensibleElement ext)
{
- Check.ArgumentNotNull(ext, "ext"); //NOXLATE
+ Check.ArgumentNotNull(ext, nameof(ext));
NameValueCollection values = new NameValueCollection();
foreach (var el in ext.Extension.Content)
{
@@ -826,8 +826,8 @@
/// <param name="values"></param>
public static void SetAllValues(this IExtensibleElement ext, NameValueCollection values)
{
- Check.ArgumentNotNull(ext, "ext"); //NOXLATE
- Check.ArgumentNotNull(values, "values"); //NOXLATE
+ Check.ArgumentNotNull(ext, nameof(ext));
+ Check.ArgumentNotNull(values, nameof(values));
var elements = new List<XmlElement>();
foreach (string name in values.Keys)
@@ -848,8 +848,8 @@
/// <param name="value"></param>
public static void SetValue(this IExtensibleElement ext, string name, string value)
{
- Check.ArgumentNotNull(ext, "ext"); //NOXLATE
- Check.ArgumentNotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotNull(ext, nameof(ext));
+ Check.ArgumentNotEmpty(name, nameof(name));
if (ext.Extension.Content != null)
{
@@ -885,8 +885,8 @@
/// <returns></returns>
public static string GetValue(this IExtensibleElement ext, string name)
{
- Check.ArgumentNotNull(ext, "ext"); //NOXLATE
- Check.ArgumentNotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotNull(ext, nameof(ext));
+ Check.ArgumentNotEmpty(name, nameof(name));
if (ext.Extension.Content != null)
{
@@ -907,7 +907,7 @@
/// <returns></returns>
public static XmlElement FindElementByName(this XmlElement[] elements, string name)
{
- Check.ArgumentNotNull(elements, "elements"); //NOXLATE
+ Check.ArgumentNotNull(elements, nameof(elements));
foreach (var el in elements)
{
if (el.Name == name)
@@ -923,7 +923,7 @@
/// <returns></returns>
public static string GetMapDefinition(this IMap map)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
return map.GetValue("ResourceId"); //NOXLATE
}
@@ -934,7 +934,7 @@
/// <param name="mapDefId"></param>
public static void SetMapDefinition(this IMap map, string mapDefId)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
map.SetValue("ResourceId", mapDefId); //NOXLATE
}
@@ -945,7 +945,7 @@
/// <returns></returns>
public static IWidgetSet GetFirstWidgetSet(this IApplicationDefinition appDef)
{
- Check.ArgumentNotNull(appDef, "appDef"); //NOXLATE
+ Check.ArgumentNotNull(appDef, nameof(appDef));
IWidgetSet set = null;
foreach (var wgt in appDef.WidgetSets)
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IEnvelope.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IEnvelope.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IEnvelope.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -70,7 +70,7 @@
/// <returns></returns>
public static IPoint2D Center(this IEnvelope env)
{
- Check.ArgumentNotNull(env, "env"); //NOXLATE
+ Check.ArgumentNotNull(env, nameof(env));
return ObjectFactory.CreatePoint2D(
(env.MinX + env.MaxX) / 2,
@@ -84,7 +84,7 @@
/// <returns></returns>
public static IEnvelope Clone(this IEnvelope env)
{
- Check.ArgumentNotNull(env, "env"); //NOXLATE
+ Check.ArgumentNotNull(env, nameof(env));
return ObjectFactory.CreateEnvelope(env.MinX, env.MinY, env.MaxX, env.MaxY);
}
@@ -95,7 +95,7 @@
/// <param name="e1"></param>
public static void ExpandToInclude(this IEnvelope env, IEnvelope e1)
{
- Check.ArgumentNotNull(env, "env"); //NOXLATE
+ Check.ArgumentNotNull(env, nameof(env));
if (e1 == null)
return;
@@ -123,7 +123,7 @@
/// </returns>
public static bool Contains(this IEnvelope env, double x, double y)
{
- Check.ArgumentNotNull(env, "env"); //NOXLATE
+ Check.ArgumentNotNull(env, nameof(env));
return env.MinX <= x &&
env.MaxX >= x &&
@@ -139,7 +139,7 @@
/// <returns></returns>
public static bool Intersects(this IEnvelope env, IEnvelope other)
{
- Check.ArgumentNotNull(env, "env"); //NOXLATE
+ Check.ArgumentNotNull(env, nameof(env));
if (other == null)
return false;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/FeatureSourceInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/FeatureSourceInterfaces.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/FeatureSourceInterfaces.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -363,7 +363,7 @@
/// <returns></returns>
public static NameValueCollection GetConnectionProperties(this IFeatureSource fs)
{
- Check.ArgumentNotNull(fs, "fs"); //NOXLATE
+ Check.ArgumentNotNull(fs, nameof(fs));
var values = new NameValueCollection();
foreach (string name in fs.ConnectionPropertyNames)
{
@@ -379,8 +379,8 @@
/// <param name="values"></param>
public static void ApplyConnectionProperties(this IFeatureSource fs, NameValueCollection values)
{
- Check.ArgumentNotNull(fs, "fs"); //NOXLATE
- Check.ArgumentNotNull(values, "values"); //NOXLATE
+ Check.ArgumentNotNull(fs, nameof(fs));
+ Check.ArgumentNotNull(values, nameof(values));
fs.ClearConnectionProperties();
@@ -400,7 +400,7 @@
/// <param name="coordSys"></param>
public static void AddSpatialContextOverride(this IFeatureSource fs, string name, string coordSys)
{
- Check.ArgumentNotNull(fs, "fs"); //NOXLATE
+ Check.ArgumentNotNull(fs, nameof(fs));
fs.AddSpatialContextOverride(new SpatialContextType() { Name = name, CoordinateSystem = coordSys });
}
@@ -412,7 +412,7 @@
/// <param name="secondary"></param>
public static void AddRelateProperty(this IAttributeRelation rel, string primary, string secondary)
{
- Check.ArgumentNotNull(rel, "rel"); //NOXLATE
+ Check.ArgumentNotNull(rel, nameof(rel));
rel.AddRelateProperty(new RelatePropertyType() { FeatureClassProperty = primary, AttributeClassProperty = secondary });
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/LayerDefinitionInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/LayerDefinitionInterfaces.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/LayerDefinitionInterfaces.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -202,7 +202,7 @@
/// <returns></returns>
public static IList<IStroke> CloneStrokes(IEnumerable<IStroke> strokes)
{
- Check.ArgumentNotNull(strokes, "strokes"); //NOXLATE
+ Check.ArgumentNotNull(strokes, nameof(strokes));
var list = new List<IStroke>();
foreach (var st in strokes)
{
@@ -2176,7 +2176,7 @@
/// <param name="c">The c.</param>
public static void SetBlockColor(this IBlockSymbol sym, Color c)
{
- Check.ArgumentNotNull(sym, "sym");
+ Check.ArgumentNotNull(sym, nameof(sym));
sym.BlockColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2187,7 +2187,7 @@
/// <param name="c">The c.</param>
public static void SetLayerColor(this IBlockSymbol sym, Color c)
{
- Check.ArgumentNotNull(sym, "sym"); //NOXLATE
+ Check.ArgumentNotNull(sym, nameof(sym));
sym.LayerColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2198,7 +2198,7 @@
/// <param name="f"></param>
public static void Apply(this IFontSymbol sym, Font f)
{
- Check.ArgumentNotNull(sym, "sym"); //NOXLATE
+ Check.ArgumentNotNull(sym, nameof(sym));
sym.FontName = f.Name;
sym.Italic = f.Italic;
sym.Bold = f.Bold;
@@ -2212,7 +2212,7 @@
/// <param name="c">The c.</param>
public static void SetForegroundColor(this IFontSymbol sym, Color c)
{
- Check.ArgumentNotNull(sym, "sym"); //NOXLATE
+ Check.ArgumentNotNull(sym, nameof(sym));
sym.ForegroundColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2225,7 +2225,7 @@
/// </returns>
public static bool HasVectorScaleRanges(this IVectorLayerDefinition vl)
{
- Check.ArgumentNotNull(vl, "vl"); //NOXLATE
+ Check.ArgumentNotNull(vl, nameof(vl));
return vl.GetScaleRangeCount() > 0;
}
@@ -2236,7 +2236,7 @@
/// <returns></returns>
public static int GetScaleRangeCount(this IVectorLayerDefinition vl)
{
- Check.ArgumentNotNull(vl, "vl"); //NOXLATE
+ Check.ArgumentNotNull(vl, nameof(vl));
var list = new List<IVectorScaleRange>(vl.VectorScaleRange);
return list.Count;
}
@@ -2248,8 +2248,8 @@
/// <param name="geomTypes">The geometry types to remove</param>
public static void RemoveStyles(this IVectorScaleRange range, IEnumerable<string> geomTypes)
{
- Check.ArgumentNotNull(range, "range"); //NOXLATE
- Check.ArgumentNotNull(geomTypes, "geomTypes"); //NOXLATE
+ Check.ArgumentNotNull(range, nameof(range));
+ Check.ArgumentNotNull(geomTypes, nameof(geomTypes));
List<IVectorStyle> remove = new List<IVectorStyle>();
@@ -2310,7 +2310,7 @@
/// <param name="c">The c.</param>
public static void SetFillColor(this IW2DSymbol sym, Color c)
{
- Check.ArgumentNotNull(sym, "sym"); //NOXLATE
+ Check.ArgumentNotNull(sym, nameof(sym));
sym.FillColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2321,7 +2321,7 @@
/// <param name="c">The c.</param>
public static void SetLineColor(this IW2DSymbol sym, Color c)
{
- Check.ArgumentNotNull(sym, "sym"); //NOXLATE
+ Check.ArgumentNotNull(sym, nameof(sym));
sym.LineColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2332,7 +2332,7 @@
/// <param name="c">The c.</param>
public static void SetTextColor(this IW2DSymbol sym, Color c)
{
- Check.ArgumentNotNull(sym, "sym"); //NOXLATE
+ Check.ArgumentNotNull(sym, nameof(sym));
sym.TextColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2343,7 +2343,7 @@
/// <param name="c">The c.</param>
public static void SetForegroundColor(this ITextSymbol sym, Color c)
{
- Check.ArgumentNotNull(sym, "sym"); //NOXLATE
+ Check.ArgumentNotNull(sym, nameof(sym));
sym.ForegroundColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2354,7 +2354,7 @@
/// <param name="c">The c.</param>
public static void SetBackgroundColor(this ITextSymbol sym, Color c)
{
- Check.ArgumentNotNull(sym, "sym"); //NOXLATE
+ Check.ArgumentNotNull(sym, nameof(sym));
sym.BackgroundColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2365,7 +2365,7 @@
/// <param name="f"></param>
public static void Apply(this ITextSymbol sym, Font f)
{
- Check.ArgumentNotNull(sym, "sym"); //NOXLATE
+ Check.ArgumentNotNull(sym, nameof(sym));
sym.FontName = f.Name;
sym.Italic = f.Italic.ToString();
sym.Bold = f.Bold.ToString();
@@ -2379,7 +2379,7 @@
/// <param name="c">The c.</param>
public static void SetBackgroundColor(this IFill fil, Color c)
{
- Check.ArgumentNotNull(fil, "fil"); //NOXLATE
+ Check.ArgumentNotNull(fil, nameof(fil));
fil.BackgroundColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2390,7 +2390,7 @@
/// <param name="c">The c.</param>
public static void SetForegroundColor(this IFill fil, Color c)
{
- Check.ArgumentNotNull(fil, "fil"); //NOXLATE
+ Check.ArgumentNotNull(fil, nameof(fil));
fil.ForegroundColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2401,7 +2401,7 @@
/// <param name="c">The c.</param>
public static void SetTransparencyColor(this IGridColorStyle style, Color c)
{
- Check.ArgumentNotNull(style, "style"); //NOXLATE
+ Check.ArgumentNotNull(style, nameof(style));
style.TransparencyColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2412,7 +2412,7 @@
/// <param name="c">The c.</param>
public static void SetDefaultColor(this IGridSurfaceStyle style, Color c)
{
- Check.ArgumentNotNull(style, "style"); //NOXLATE
+ Check.ArgumentNotNull(style, nameof(style));
style.DefaultColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2422,7 +2422,7 @@
/// <param name="style"></param>
public static void RemoveAllRules(this ICompositeTypeStyle style)
{
- Check.ArgumentNotNull(style, "style"); //NOXLATE
+ Check.ArgumentNotNull(style, nameof(style));
var remove = new List<ICompositeRule>();
foreach (var r in style.CompositeRule)
@@ -2446,7 +2446,7 @@
/// <returns>The defined parameter</returns>
public static IParameter DefineParameter(this ISimpleSymbolDefinition simpleSym, string identifier, string defaultValue, string displayName, string description, string dataType)
{
- Check.ArgumentNotNull(simpleSym, "simpleSym");
+ Check.ArgumentNotNull(simpleSym, nameof(simpleSym));
var p = simpleSym.CreateParameter();
p.Identifier = identifier;
p.DefaultValue = defaultValue;
@@ -2467,7 +2467,7 @@
/// <returns>The added parameter override</returns>
public static IParameterOverride AddOverride(this IParameterOverrideCollection overrides, string symbolName, string paramName, string paramValue)
{
- Check.ArgumentNotNull(overrides, "overrides");
+ Check.ArgumentNotNull(overrides, nameof(overrides));
var ov = overrides.CreateParameterOverride(symbolName, paramName);
ov.ParameterValue = paramValue;
overrides.AddOverride(ov);
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0/VectorLayerDefinitionImpl.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0/VectorLayerDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -952,7 +952,7 @@
void ILineRule.SetStrokes(IEnumerable<IStroke> strokes)
{
- Check.ArgumentNotNull(strokes, "strokes"); //NOXLATE
+ Check.ArgumentNotNull(strokes, nameof(strokes));
this.Items.Clear();
foreach (var stroke in strokes)
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0/VectorLayerDefinitionImpl.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0/VectorLayerDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -952,7 +952,7 @@
void ILineRule.SetStrokes(IEnumerable<IStroke> strokes)
{
- Check.ArgumentNotNull(strokes, "strokes"); //NOXLATE
+ Check.ArgumentNotNull(strokes, nameof(strokes));
this.Items.Clear();
foreach (var stroke in strokes)
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0/VectorLayerDefinitionImpl.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0/VectorLayerDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -952,7 +952,7 @@
void ILineRule.SetStrokes(IEnumerable<IStroke> strokes)
{
- Check.ArgumentNotNull(strokes, "strokes"); //NOXLATE
+ Check.ArgumentNotNull(strokes, nameof(strokes));
this.Items.Clear();
foreach (var stroke in strokes)
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0/VectorLayerDefinitionImpl.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0/VectorLayerDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -953,7 +953,7 @@
void ILineRule.SetStrokes(IEnumerable<IStroke> strokes)
{
- Check.ArgumentNotNull(strokes, "strokes"); //NOXLATE
+ Check.ArgumentNotNull(strokes, nameof(strokes));
this.Items.Clear();
foreach (var stroke in strokes)
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0/VectorLayerDefinitionImpl.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0/VectorLayerDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -955,7 +955,7 @@
void ILineRule.SetStrokes(IEnumerable<IStroke> strokes)
{
- Check.ArgumentNotNull(strokes, "strokes"); //NOXLATE
+ Check.ArgumentNotNull(strokes, nameof(strokes));
this.Items.Clear();
foreach (var stroke in strokes)
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0/VectorLayerDefinitionImpl.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0/VectorLayerDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -955,7 +955,7 @@
void ILineRule.SetStrokes(IEnumerable<IStroke> strokes)
{
- Check.ArgumentNotNull(strokes, "strokes"); //NOXLATE
+ Check.ArgumentNotNull(strokes, nameof(strokes));
this.Items.Clear();
foreach (var stroke in strokes)
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/LoadProcedureInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/LoadProcedureInterfaces.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/LoadProcedureInterfaces.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -261,8 +261,8 @@
/// <param name="files"></param>
public static void AddFiles(this IBaseLoadProcedure proc, IEnumerable<string> files)
{
- Check.ArgumentNotNull(proc, "proc"); //NOXLATE
- Check.ArgumentNotNull(files, "files"); //NOXLATE
+ Check.ArgumentNotNull(proc, nameof(proc));
+ Check.ArgumentNotNull(files, nameof(files));
foreach (var f in files)
{
proc.AddFile(f);
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_0_0/LoadProcedureImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_0_0/LoadProcedureImpl.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_0_0/LoadProcedureImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -132,7 +132,7 @@
public void AddFiles(IEnumerable<string> files)
{
- Check.ArgumentNotNull(files, "files"); //NOXLATE
+ Check.ArgumentNotNull(files, nameof(files));
var _files = this.sourceFileField;
foreach (var f in files)
@@ -144,7 +144,7 @@
public void RemoveFile(string file)
{
- Check.ArgumentNotEmpty(file, "file"); //NOXLATE
+ Check.ArgumentNotEmpty(file, nameof(file));
if (this.sourceFileField.Contains(file))
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0/LoadProcedureImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0/LoadProcedureImpl.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0/LoadProcedureImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -133,7 +133,7 @@
public void AddFiles(IEnumerable<string> files)
{
- Check.ArgumentNotNull(files, "files"); //NOXLATE
+ Check.ArgumentNotNull(files, nameof(files));
var _files = this.sourceFileField;
foreach (var f in files)
@@ -145,7 +145,7 @@
public void RemoveFile(string file)
{
- Check.ArgumentNotEmpty(file, "file"); //NOXLATE
+ Check.ArgumentNotEmpty(file, nameof(file));
if (this.sourceFileField.Contains(file))
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v2_4_0/LoadProcedureImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v2_4_0/LoadProcedureImpl.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v2_4_0/LoadProcedureImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -133,7 +133,7 @@
public void AddFiles(IEnumerable<string> files)
{
- Check.ArgumentNotNull(files, "files"); //NOXLATE
+ Check.ArgumentNotNull(files, nameof(files));
var _files = this.sourceFileField;
foreach (var f in files)
@@ -145,7 +145,7 @@
public void RemoveFile(string file)
{
- Check.ArgumentNotEmpty(file, "file"); //NOXLATE
+ Check.ArgumentNotEmpty(file, nameof(file));
if (this.sourceFileField.Contains(file))
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/MapDefinitionInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/MapDefinitionInterfaces.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/MapDefinitionInterfaces.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -372,7 +372,7 @@
/// <param name="scale"></param>
public static void AddFiniteDisplayScale(this IMapDefinition map, double scale)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
if (map.BaseMap != null)
map.InitBaseMap();
@@ -388,7 +388,7 @@
/// <param name="bDetachIfEmpty"></param>
public static void RemoveFiniteDisplayScale(this IMapDefinition map, double scale, bool bDetachIfEmpty)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
if (map.BaseMap == null)
return;
@@ -405,7 +405,7 @@
/// <param name="bDetachIfEmpty"></param>
public static void RemoveAllFiniteDisplayScales(this IMapDefinition map, bool bDetachIfEmpty)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
if (map.BaseMap == null)
return;
@@ -423,8 +423,8 @@
/// <returns></returns>
public static IBaseMapGroup AddBaseLayerGroup(this IMapDefinition map, string name)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
- Check.ArgumentNotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
+ Check.ArgumentNotEmpty(name, nameof(name));
if (map.BaseMap == null)
map.InitBaseMap();
@@ -440,7 +440,7 @@
/// <param name="bDetachIfEmpty"></param>
public static void RemoveBaseLayerGroup(this IMapDefinition map, IBaseMapGroup group, bool bDetachIfEmpty)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
if (null == group)
return;
@@ -460,9 +460,9 @@
/// <param name="newGroupName">New name of the group.</param>
public static void UpdateDynamicGroupName(this IMapDefinition map, string oldGroupName, string newGroupName)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
- Check.ArgumentNotEmpty(oldGroupName, "oldGroupName"); //NOXLATE
- Check.ArgumentNotEmpty(newGroupName, "newGroupName"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
+ Check.ArgumentNotEmpty(oldGroupName, nameof(oldGroupName));
+ Check.ArgumentNotEmpty(newGroupName, nameof(newGroupName));
var layers = map.GetLayersForGroup(oldGroupName);
var groups = map.GetGroupsForGroup(oldGroupName);
foreach (var l in layers)
@@ -483,8 +483,8 @@
/// <returns>The number of layers removed. Returns 0 if the group is empty or does not exist</returns>
public static int RemoveLayerGroupAndChildLayers(this IMapDefinition map, string groupName)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
- Check.ArgumentNotEmpty(groupName, "groupName"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
+ Check.ArgumentNotEmpty(groupName, nameof(groupName));
var affectedParentGroups = new Dictionary<string, List<IMapLayerGroup>>();
IMapLayerGroup group = null;
@@ -539,8 +539,8 @@
/// <returns></returns>
public static IMapLayer GetLayerByName(this IMapDefinition map, string name)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
- Check.ArgumentNotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
+ Check.ArgumentNotEmpty(name, nameof(name));
foreach (var layer in map.MapLayer)
{
if (name.Equals(layer.Name))
@@ -557,7 +557,7 @@
/// <returns></returns>
public static IMapLayerGroup GetGroupByName(this IMapDefinition map, string name)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
foreach (var group in map.MapLayerGroup)
{
if (name.Equals(group.Name))
@@ -573,7 +573,7 @@
/// <returns></returns>
public static int GetDynamicLayerCount(this IMapDefinition map)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
return new List<IMapLayer>(map.MapLayer).Count;
}
@@ -584,7 +584,7 @@
/// <returns></returns>
public static int GetGroupCount(this IMapDefinition map)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
return new List<IMapLayerGroup>(map.MapLayerGroup).Count;
}
@@ -596,7 +596,7 @@
/// <returns></returns>
public static IEnumerable<IMapLayer> GetLayersForGroup(this IMapDefinition map, string name)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
foreach (var layer in map.MapLayer)
{
if (name.Equals(layer.Group))
@@ -612,7 +612,7 @@
/// <returns></returns>
public static IEnumerable<IMapLayerGroup> GetGroupsForGroup(this IMapDefinition map, string name)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
foreach (var group in map.MapLayerGroup)
{
if (name.Equals(group.Group))
@@ -627,7 +627,7 @@
/// <returns></returns>
public static IEnumerable<IMapLayer> GetLayersWithoutGroups(this IMapDefinition map)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
foreach (var layer in map.MapLayer)
{
if (string.IsNullOrEmpty(layer.Group))
@@ -642,7 +642,7 @@
/// <returns></returns>
public static ITileSetDefinition ConvertToTileSet(this IMapDefinition map, Version schemaVersion)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
var tsd = ObjectFactory.CreateTileSetDefinition(schemaVersion, map.Extents.Clone());
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v1_0_0/MapDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v1_0_0/MapDefinitionImpl.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v1_0_0/MapDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -214,8 +214,8 @@
/// <param name="layer"></param>
void IMapDefinition.InsertLayer(int idx, IMapLayer layer)
{
- Check.ThatArgumentIsBetweenRange(idx, 0, this.MapLayer.Count, true, "idx (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]"); //NOXLATE
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ThatArgumentIsBetweenRange(idx, 0, this.MapLayer.Count, true, nameof(idx) + " (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
var li = layer as MapLayerType;
if (li != null)
{
@@ -243,14 +243,14 @@
this.Extents.MaxY = maxy;
this.Extents.MinX = minx;
this.Extents.MinY = miny;
- OnPropertyChanged("Extents"); //NOXLATE
+ OnPropertyChanged(nameof(Extents));
}
}
public IMapLayerGroup AddGroup(string groupName)
{
- Check.ArgumentNotEmpty(groupName, "groupName"); //NOXLATE
- Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) == null, "<groupName> does not already exist"); //NOXLATE
+ Check.ArgumentNotEmpty(groupName, nameof(groupName));
+ Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) == null, $"<{nameof(groupName)}> does not already exist"); //NOXLATE
if (this.MapLayerGroup == null)
this.MapLayerGroup = new System.ComponentModel.BindingList<MapLayerGroupType>();
@@ -271,13 +271,13 @@
public IMapLayer AddLayer(string groupName, string layerName, string layerDefinitionId)
{
- Check.ArgumentNotEmpty(layerName, "layerName"); //NOXLATE
- Check.ArgumentNotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), "ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ArgumentNotEmpty(layerName, nameof(layerName));
+ Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
if (!string.IsNullOrEmpty(groupName))
{
- Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) != null, "There should be an existing group for <groupName>"); //NOXLATE
+ Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) != null, $"There should be an existing group for <{groupName}>"); //NOXLATE
}
var layer = new MapLayerType()
{
@@ -305,14 +305,14 @@
public IMapLayer InsertLayer(int index, string groupName, string layerName, string layerDefinitionId)
{
- Check.ThatArgumentIsBetweenRange(index, 0, this.MapLayer.Count, true, "index (" + index + ") between [" + 0 + "," + this.MapLayer.Count + "]");
- Check.ArgumentNotEmpty(layerName, "layerName"); //NOXLATE
- Check.ArgumentNotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), "ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ThatArgumentIsBetweenRange(index, 0, this.MapLayer.Count, true, nameof(index) + " (" + index + ") between [" + 0 + "," + this.MapLayer.Count + "]");
+ Check.ArgumentNotEmpty(layerName, nameof(layerName));
+ Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
if (!string.IsNullOrEmpty(groupName))
{
- Check.ArgumentNotNull(this.GetGroupByName(groupName), "Group for <groupName>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>"); //NOXLATE
}
var layer = new MapLayerType()
{
@@ -332,13 +332,13 @@
public IMapLayer AddLayer(IMapLayer layerToInsertAbove, string groupName, string layerName, string layerDefinitionId)
{
- Check.ArgumentNotEmpty(layerName, "layerName"); //NOXLATE
- Check.ArgumentNotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), "ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ArgumentNotEmpty(layerName, nameof(layerName));
+ Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
if (!string.IsNullOrEmpty(groupName))
{
- Check.ArgumentNotNull(this.GetGroupByName(groupName), "Group for <groupName>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>"); //NOXLATE
}
var layer = new MapLayerType()
{
@@ -491,7 +491,7 @@
void IMapDefinition.RemoveGroup(IMapLayerGroup group)
{
- Check.ArgumentNotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, nameof(group)); //NOXLATE
var grp = group as MapLayerGroupType;
if (grp != null)
{
@@ -512,7 +512,7 @@
int IMapDefinition.GetIndex(IMapLayer layer)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
var lyr = layer as MapLayerType;
if (lyr != null)
return this.MapLayer.IndexOf(lyr);
@@ -522,7 +522,7 @@
int IMapDefinition.MoveUp(IMapLayer layer)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc > 0)
{
@@ -548,7 +548,7 @@
int IMapDefinition.MoveDown(IMapLayer layer)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc < this.MapLayer.Count - 1)
{
@@ -574,7 +574,7 @@
int IMapDefinition.MoveUpGroup(IMapLayerGroup group)
{
- Check.ArgumentNotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, nameof(group));
var grp = group as MapLayerGroupType;
if (grp != null)
{
@@ -604,7 +604,7 @@
int IMapDefinition.MoveDownGroup(IMapLayerGroup group)
{
- Check.ArgumentNotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, nameof(group));
var grp = group as MapLayerGroupType;
if (grp != null)
{
@@ -634,7 +634,7 @@
int IMapDefinition.GetIndex(IMapLayerGroup group)
{
- Check.ArgumentNotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, nameof(group));
var grp = group as MapLayerGroupType;
if (grp != null)
return this.MapLayerGroup.IndexOf(grp);
@@ -644,7 +644,7 @@
void IMapDefinition.SetTopDrawOrder(IMapLayer layer)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc > 0)
{
@@ -663,7 +663,7 @@
void IMapDefinition.SetBottomDrawOrder(IMapLayer layer)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc >= 0 && isrc < this.MapLayer.Count)
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_3_0/MapDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_3_0/MapDefinitionImpl.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_3_0/MapDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -215,8 +215,8 @@
/// <param name="layer"></param>
void IMapDefinition.InsertLayer(int idx, IMapLayer layer)
{
- Check.ThatArgumentIsBetweenRange(idx, 0, this.MapLayer.Count, true, "idx (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]"); //NOXLATE
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ThatArgumentIsBetweenRange(idx, 0, this.MapLayer.Count, true, nameof(idx) + " (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
var li = layer as MapLayerType;
if (li != null)
{
@@ -250,8 +250,8 @@
public IMapLayerGroup AddGroup(string groupName)
{
- Check.ArgumentNotEmpty(groupName, "groupName"); //NOXLATE
- Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) == null, "<groupName> does not already exist"); //NOXLATE
+ Check.ArgumentNotEmpty(groupName, nameof(groupName));
+ Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) == null, $"<{nameof(groupName)}> does not already exist"); //NOXLATE
if (this.MapLayerGroup == null)
this.MapLayerGroup = new System.ComponentModel.BindingList<MapLayerGroupType>();
@@ -272,13 +272,13 @@
public IMapLayer AddLayer(string groupName, string layerName, string layerDefinitionId)
{
- Check.ArgumentNotEmpty(layerName, "layerName"); //NOXLATE
- Check.ArgumentNotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), "ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ArgumentNotEmpty(layerName, nameof(layerName));
+ Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
if (!string.IsNullOrEmpty(groupName))
{
- Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) != null, "There should be an existing group for <groupName>"); //NOXLATE
+ Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) != null, $"There should be an existing group for <{nameof(groupName)}>"); //NOXLATE
}
var layer = new MapLayerType()
{
@@ -306,14 +306,14 @@
public IMapLayer InsertLayer(int index, string groupName, string layerName, string layerDefinitionId)
{
- Check.ThatArgumentIsBetweenRange(index, 0, this.MapLayer.Count, true, "index (" + index + ") between [" + 0 + "," + this.MapLayer.Count + "]");
- Check.ArgumentNotEmpty(layerName, "layerName"); //NOXLATE
- Check.ArgumentNotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), "ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ThatArgumentIsBetweenRange(index, 0, this.MapLayer.Count, true, nameof(index) + " (" + index + ") between [" + 0 + "," + this.MapLayer.Count + "]");
+ Check.ArgumentNotEmpty(layerName, nameof(layerName));
+ Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
if (!string.IsNullOrEmpty(groupName))
{
- Check.ArgumentNotNull(this.GetGroupByName(groupName), "Group for <groupName>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>"); //NOXLATE
}
var layer = new MapLayerType()
{
@@ -333,13 +333,13 @@
public IMapLayer AddLayer(IMapLayer layerToInsertAbove, string groupName, string layerName, string layerDefinitionId)
{
- Check.ArgumentNotEmpty(layerName, "layerName"); //NOXLATE
- Check.ArgumentNotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), "ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ArgumentNotEmpty(layerName, nameof(layerName));
+ Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
if (!string.IsNullOrEmpty(groupName))
{
- Check.ArgumentNotNull(this.GetGroupByName(groupName), "Group for <groupName>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>"); //NOXLATE
}
var layer = new MapLayerType()
{
@@ -492,7 +492,7 @@
void IMapDefinition.RemoveGroup(IMapLayerGroup group)
{
- Check.ArgumentNotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, nameof(group));
var grp = group as MapLayerGroupType;
if (grp != null)
{
@@ -513,7 +513,7 @@
int IMapDefinition.GetIndex(IMapLayer layer)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
var lyr = layer as MapLayerType;
if (lyr != null)
return this.MapLayer.IndexOf(lyr);
@@ -523,7 +523,7 @@
int IMapDefinition.MoveUp(IMapLayer layer)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc > 0)
{
@@ -549,7 +549,7 @@
int IMapDefinition.MoveDown(IMapLayer layer)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc < this.MapLayer.Count - 1)
{
@@ -575,7 +575,7 @@
int IMapDefinition.MoveUpGroup(IMapLayerGroup group)
{
- Check.ArgumentNotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, nameof(group));
var grp = group as MapLayerGroupType;
if (grp != null)
{
@@ -605,7 +605,7 @@
int IMapDefinition.MoveDownGroup(IMapLayerGroup group)
{
- Check.ArgumentNotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, nameof(group));
var grp = group as MapLayerGroupType;
if (grp != null)
{
@@ -635,7 +635,7 @@
int IMapDefinition.GetIndex(IMapLayerGroup group)
{
- Check.ArgumentNotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, nameof(group));
var grp = group as MapLayerGroupType;
if (grp != null)
return this.MapLayerGroup.IndexOf(grp);
@@ -645,7 +645,7 @@
void IMapDefinition.SetTopDrawOrder(IMapLayer layer)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc > 0)
{
@@ -664,7 +664,7 @@
void IMapDefinition.SetBottomDrawOrder(IMapLayer layer)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc >= 0 && isrc < this.MapLayer.Count)
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_4_0/MapDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_4_0/MapDefinitionImpl.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_4_0/MapDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -216,8 +216,8 @@
/// <param name="layer"></param>
void IMapDefinition.InsertLayer(int idx, IMapLayer layer)
{
- Check.ThatArgumentIsBetweenRange(idx, 0, this.MapLayer.Count, true, "idx (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]"); //NOXLATE
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ThatArgumentIsBetweenRange(idx, 0, this.MapLayer.Count, true, nameof(idx) + " (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
var li = layer as MapLayerType;
if (li != null)
{
@@ -251,8 +251,8 @@
public IMapLayerGroup AddGroup(string groupName)
{
- Check.ArgumentNotEmpty(groupName, "groupName"); //NOXLATE
- Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) == null, "<groupName> does not already exist"); //NOXLATE
+ Check.ArgumentNotEmpty(groupName, nameof(groupName));
+ Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) == null, $"<{nameof(groupName)}> does not already exist"); //NOXLATE
if (this.MapLayerGroup == null)
this.MapLayerGroup = new System.ComponentModel.BindingList<MapLayerGroupType>();
@@ -273,13 +273,13 @@
public IMapLayer AddLayer(string groupName, string layerName, string layerDefinitionId)
{
- Check.ArgumentNotEmpty(layerName, "layerName"); //NOXLATE
- Check.ArgumentNotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), "ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ArgumentNotEmpty(layerName, nameof(layerName));
+ Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
if (!string.IsNullOrEmpty(groupName))
{
- Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) != null, "There should be an existing group for <groupName>"); //NOXLATE
+ Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) != null, $"There should be an existing group for <{nameof(groupName)}>"); //NOXLATE
}
var layer = new MapLayerType()
{
@@ -307,14 +307,14 @@
public IMapLayer InsertLayer(int index, string groupName, string layerName, string layerDefinitionId)
{
- Check.ThatArgumentIsBetweenRange(index, 0, this.MapLayer.Count, true, "index (" + index + ") between [" + 0 + "," + this.MapLayer.Count + "]");
- Check.ArgumentNotEmpty(layerName, "layerName"); //NOXLATE
- Check.ArgumentNotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), "ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ThatArgumentIsBetweenRange(index, 0, this.MapLayer.Count, true, nameof(index) + " (" + index + ") between [" + 0 + "," + this.MapLayer.Count + "]");
+ Check.ArgumentNotEmpty(layerName, nameof(layerName));
+ Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
if (!string.IsNullOrEmpty(groupName))
{
- Check.ArgumentNotNull(this.GetGroupByName(groupName), "Group for <groupName>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>"); //NOXLATE
}
var layer = new MapLayerType()
{
@@ -334,13 +334,13 @@
public IMapLayer AddLayer(IMapLayer layerToInsertAbove, string groupName, string layerName, string layerDefinitionId)
{
- Check.ArgumentNotEmpty(layerName, "layerName"); //NOXLATE
- Check.ArgumentNotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), "ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ArgumentNotEmpty(layerName, nameof(layerName));
+ Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
if (!string.IsNullOrEmpty(groupName))
{
- Check.ArgumentNotNull(this.GetGroupByName(groupName), "Group for <groupName>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>"); //NOXLATE
}
var layer = new MapLayerType()
{
@@ -493,7 +493,7 @@
void IMapDefinition.RemoveGroup(IMapLayerGroup group)
{
- Check.ArgumentNotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, nameof(group));
var grp = group as MapLayerGroupType;
if (grp != null)
{
@@ -514,7 +514,7 @@
int IMapDefinition.GetIndex(IMapLayer layer)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
var lyr = layer as MapLayerType;
if (lyr != null)
return this.MapLayer.IndexOf(lyr);
@@ -524,7 +524,7 @@
int IMapDefinition.MoveUp(IMapLayer layer)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc > 0)
{
@@ -550,7 +550,7 @@
int IMapDefinition.MoveDown(IMapLayer layer)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc < this.MapLayer.Count - 1)
{
@@ -576,7 +576,7 @@
int IMapDefinition.MoveUpGroup(IMapLayerGroup group)
{
- Check.ArgumentNotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, nameof(group));
var grp = group as MapLayerGroupType;
if (grp != null)
{
@@ -606,7 +606,7 @@
int IMapDefinition.MoveDownGroup(IMapLayerGroup group)
{
- Check.ArgumentNotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, nameof(group));
var grp = group as MapLayerGroupType;
if (grp != null)
{
@@ -636,7 +636,7 @@
int IMapDefinition.GetIndex(IMapLayerGroup group)
{
- Check.ArgumentNotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, nameof(group));
var grp = group as MapLayerGroupType;
if (grp != null)
return this.MapLayerGroup.IndexOf(grp);
@@ -646,7 +646,7 @@
void IMapDefinition.SetTopDrawOrder(IMapLayer layer)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc > 0)
{
@@ -665,7 +665,7 @@
void IMapDefinition.SetBottomDrawOrder(IMapLayer layer)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc >= 0 && isrc < this.MapLayer.Count)
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0/MapDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0/MapDefinitionImpl.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0/MapDefinitionImpl.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -125,7 +125,7 @@
{
if (value != null)
{
- Check.ThatPreconditionIsMet(value.EndsWith(".TileSetDefinition"), "value.EndsWith(\".TileSetDefinition\")");
+ Check.ThatPreconditionIsMet(value.EndsWith(".TileSetDefinition"), nameof(value) + ".EndsWith(\".TileSetDefinition\")");
this.TileSetSource = new MapDefinitionTypeTileSetSource()
{
ResourceId = value
@@ -252,8 +252,8 @@
/// <param name="layer"></param>
void IMapDefinition.InsertLayer(int idx, IMapLayer layer)
{
- Check.ThatArgumentIsBetweenRange(idx, 0, this.MapLayer.Count, true, "idx (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]"); //NOXLATE
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ThatArgumentIsBetweenRange(idx, 0, this.MapLayer.Count, true, nameof(idx) + " (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
var li = layer as MapLayerType;
if (li != null)
{
@@ -287,8 +287,8 @@
public IMapLayerGroup AddGroup(string groupName)
{
- Check.ArgumentNotEmpty(groupName, "groupName"); //NOXLATE
- Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) == null, "<groupName> does not already exist"); //NOXLATE
+ Check.ArgumentNotEmpty(groupName, nameof(groupName));
+ Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) == null, $"<{nameof(groupName)}> does not already exist"); //NOXLATE
if (this.MapLayerGroup == null)
this.MapLayerGroup = new System.ComponentModel.BindingList<MapLayerGroupType>();
@@ -309,13 +309,13 @@
public IMapLayer AddLayer(string groupName, string layerName, string layerDefinitionId)
{
- Check.ArgumentNotEmpty(layerName, "layerName"); //NOXLATE
- Check.ArgumentNotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), "ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ArgumentNotEmpty(layerName, nameof(layerName));
+ Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
if (!string.IsNullOrEmpty(groupName))
{
- Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) != null, "There should be an existing group for <groupName>"); //NOXLATE
+ Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) != null, $"There should be an existing group for <{nameof(groupName)}>"); //NOXLATE
}
var layer = new MapLayerType()
{
@@ -343,14 +343,14 @@
public IMapLayer InsertLayer(int index, string groupName, string layerName, string layerDefinitionId)
{
- Check.ThatArgumentIsBetweenRange(index, 0, this.MapLayer.Count, true, "index (" + index + ") between [" + 0 + "," + this.MapLayer.Count + "]");
- Check.ArgumentNotEmpty(layerName, "layerName"); //NOXLATE
- Check.ArgumentNotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), "ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ThatArgumentIsBetweenRange(index, 0, this.MapLayer.Count, true, nameof(index) + " (" + index + ") between [" + 0 + "," + this.MapLayer.Count + "]");
+ Check.ArgumentNotEmpty(layerName, nameof(layerName));
+ Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
if (!string.IsNullOrEmpty(groupName))
{
- Check.ArgumentNotNull(this.GetGroupByName(groupName), "Group for <groupName>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>"); //NOXLATE
}
var layer = new MapLayerType()
{
@@ -370,13 +370,13 @@
public IMapLayer AddLayer(IMapLayer layerToInsertAbove, string groupName, string layerName, string layerDefinitionId)
{
- Check.ArgumentNotEmpty(layerName, "layerName"); //NOXLATE
- Check.ArgumentNotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
- Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), "ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ Check.ArgumentNotEmpty(layerName, nameof(layerName));
+ Check.ArgumentNotEmpty(layerDefinitionId, nameof(layerDefinitionId));
+ Check.ThatPreconditionIsMet(ResourceIdentifier.Validate(layerDefinitionId), $"ResourceIdentifier.Validate({nameof(layerDefinitionId)})"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), $"ResourceIdentifier.GetResourceTypeAsString({nameof(layerDefinitionId)}) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
if (!string.IsNullOrEmpty(groupName))
{
- Check.ArgumentNotNull(this.GetGroupByName(groupName), "Group for <groupName>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), $"Group for <{nameof(groupName)}>"); //NOXLATE
}
var layer = new MapLayerType()
{
@@ -532,7 +532,7 @@
void IMapDefinition.RemoveGroup(IMapLayerGroup group)
{
- Check.ArgumentNotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, nameof(group));
var grp = group as MapLayerGroupType;
if (grp != null)
{
@@ -553,7 +553,7 @@
int IMapDefinition.GetIndex(IMapLayer layer)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
var lyr = layer as MapLayerType;
if (lyr != null)
return this.MapLayer.IndexOf(lyr);
@@ -563,7 +563,7 @@
int IMapDefinition.MoveUp(IMapLayer layer)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc > 0)
{
@@ -589,7 +589,7 @@
int IMapDefinition.MoveDown(IMapLayer layer)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc < this.MapLayer.Count - 1)
{
@@ -615,7 +615,7 @@
int IMapDefinition.MoveUpGroup(IMapLayerGroup group)
{
- Check.ArgumentNotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, nameof(group));
var grp = group as MapLayerGroupType;
if (grp != null)
{
@@ -645,7 +645,7 @@
int IMapDefinition.MoveDownGroup(IMapLayerGroup group)
{
- Check.ArgumentNotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, nameof(group));
var grp = group as MapLayerGroupType;
if (grp != null)
{
@@ -675,7 +675,7 @@
int IMapDefinition.GetIndex(IMapLayerGroup group)
{
- Check.ArgumentNotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, nameof(group));
var grp = group as MapLayerGroupType;
if (grp != null)
return this.MapLayerGroup.IndexOf(grp);
@@ -685,7 +685,7 @@
void IMapDefinition.SetTopDrawOrder(IMapLayer layer)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc > 0)
{
@@ -704,7 +704,7 @@
void IMapDefinition.SetBottomDrawOrder(IMapLayer layer)
{
- Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, nameof(layer));
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc >= 0 && isrc < this.MapLayer.Count)
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ObjectFactory.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ObjectFactory.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ObjectFactory.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -286,8 +286,8 @@
/// <param name="serializer">The serializer.</param>
public static void RegisterResource(ResourceTypeDescriptor desc, ResourceSerializer serializer)
{
- Check.ArgumentNotNull(desc, "desc");
- Check.ArgumentNotNull(serializer, "serializer");
+ Check.ArgumentNotNull(desc, nameof(desc));
+ Check.ArgumentNotNull(serializer, nameof(serializer));
ResourceTypeRegistry.RegisterResource(desc, serializer);
}
@@ -299,9 +299,9 @@
/// <param name="deserializeMethod">The deserialize method.</param>
public static void RegisterResourceSerializer(ResourceTypeDescriptor resourceType, Func<IResource, Stream> serializer, Func<string, IResource> deserializer)
{
- Check.ArgumentNotNull(resourceType, "resourceType");
- Check.ArgumentNotNull(serializer, "serializer");
- Check.ArgumentNotNull(deserializer, "deserializer");
+ Check.ArgumentNotNull(resourceType, nameof(resourceType));
+ Check.ArgumentNotNull(serializer, nameof(serializer));
+ Check.ArgumentNotNull(deserializer, nameof(deserializer));
ResourceTypeRegistry.RegisterResource(resourceType, serializer, deserializer);
}
@@ -312,8 +312,8 @@
/// <param name="func"></param>
public static void RegisterCompoundSymbolFactoryMethod(Version version, Func<ICompoundSymbolDefinition> func)
{
- Check.ArgumentNotNull(version, "version");
- Check.ArgumentNotNull(func, "func");
+ Check.ArgumentNotNull(version, nameof(version));
+ Check.ArgumentNotNull(func, nameof(func));
if (_compoundSymbolFactories.ContainsKey(version))
throw new ArgumentException(Strings.FactoryMethodAlreadyRegistered + version);
@@ -327,8 +327,8 @@
/// <param name="func"></param>
public static void RegisterSimpleSymbolFactoryMethod(Version version, Func<ISimpleSymbolDefinition> func)
{
- Check.ArgumentNotNull(version, "version");
- Check.ArgumentNotNull(func, "func");
+ Check.ArgumentNotNull(version, nameof(version));
+ Check.ArgumentNotNull(func, nameof(func));
if (_simpleSymbolFactories.ContainsKey(version))
throw new ArgumentException(Strings.FactoryMethodAlreadyRegistered + version);
@@ -342,8 +342,8 @@
/// <param name="method">The method.</param>
public static void RegisterLayerFactoryMethod(Version version, Func<LayerType, ILayerDefinition> method)
{
- Check.ArgumentNotNull(version, "version");
- Check.ArgumentNotNull(method, "method");
+ Check.ArgumentNotNull(version, nameof(version));
+ Check.ArgumentNotNull(method, nameof(method));
if (_layerFactories.ContainsKey(version))
throw new ArgumentException(Strings.FactoryMethodAlreadyRegistered + version);
@@ -357,7 +357,7 @@
/// <param name="method">The method.</param>
public static void RegisterLoadProcedureFactoryMethod(LoadType type, Func<ILoadProcedure> method)
{
- Check.ArgumentNotNull(method, "method");
+ Check.ArgumentNotNull(method, nameof(method));
if (_loadProcFactories.ContainsKey(type))
throw new ArgumentException(Strings.LoadProcFactoryMethodAlreadyRegistered + type);
@@ -371,8 +371,8 @@
/// <param name="method">The method.</param>
public static void RegisterWebLayoutFactoryMethod(Version version, Func<string, IWebLayout> method)
{
- Check.ArgumentNotNull(version, "version");
- Check.ArgumentNotNull(method, "method");
+ Check.ArgumentNotNull(version, nameof(version));
+ Check.ArgumentNotNull(method, nameof(method));
if (_wlFactories.ContainsKey(version))
throw new ArgumentException(Strings.FactoryMethodAlreadyRegistered + version);
@@ -386,8 +386,8 @@
/// <param name="method"></param>
public static void RegisterMapDefinitionFactoryMethod(Version version, Func<IMapDefinition> method)
{
- Check.ArgumentNotNull(version, "version");
- Check.ArgumentNotNull(method, "method");
+ Check.ArgumentNotNull(version, nameof(version));
+ Check.ArgumentNotNull(method, nameof(method));
if (_mapDefinitionFactories.ContainsKey(version))
throw new ArgumentException(Strings.FactoryMethodAlreadyRegistered + version);
@@ -401,8 +401,8 @@
/// <param name="method"></param>
public static void RegisterWatermarkDefinitionFactoryMethod(Version version, Func<SymbolDefinitionType, IWatermarkDefinition> method)
{
- Check.ArgumentNotNull(version, "version");
- Check.ArgumentNotNull(method, "method");
+ Check.ArgumentNotNull(version, nameof(version));
+ Check.ArgumentNotNull(method, nameof(method));
if (_watermarkFactories.ContainsKey(version))
throw new ArgumentException(Strings.FactoryMethodAlreadyRegistered + version);
@@ -416,8 +416,8 @@
/// <param name="func"></param>
public static void RegisterTileSetDefinitionFactoryMethod(Version version, Func<ITileSetDefinition> func)
{
- Check.ArgumentNotNull(version, "version");
- Check.ArgumentNotNull(func, "func");
+ Check.ArgumentNotNull(version, nameof(version));
+ Check.ArgumentNotNull(func, nameof(func));
if (_tileSetDefinitionFactories.ContainsKey(version))
throw new ArgumentException(Strings.FactoryMethodAlreadyRegistered + version);
@@ -734,7 +734,7 @@
/// <returns></returns>
public static ITileSetDefinition CreateTileSetDefinition(Version version)
{
- Check.ArgumentNotNull(version, "version"); //NOXLATE
+ Check.ArgumentNotNull(version, nameof(version));
if (!_mapDefinitionFactories.ContainsKey(version))
throw new ArgumentException(Strings.UnknownTileDefinitionVersion + version.ToString());
@@ -775,7 +775,7 @@
public static IApplicationDefinition DeserializeEmbeddedFlexLayout(Version siteVersion)
{
- Check.ArgumentNotNull(siteVersion, "siteVersion"); //NOXLATE
+ Check.ArgumentNotNull(siteVersion, nameof(siteVersion));
if (siteVersion >= VER_240)
return (IApplicationDefinition)ResourceTypeRegistry.Deserialize(Strings.BaseTemplate240_ApplicationDefinition);
else
@@ -822,10 +822,10 @@
IApplicationDefinitionContainerInfoSet containers,
string templateName)
{
- Check.ArgumentNotNull(templates, "templates"); //NOXLATE
- Check.ArgumentNotNull(widgets, "widgets"); //NOXLATE
- Check.ArgumentNotNull(containers, "containers"); //NOXLATE
- Check.ArgumentNotNull(templateName, "templateName"); //NOXLATE
+ Check.ArgumentNotNull(templates, nameof(templates));
+ Check.ArgumentNotNull(widgets, nameof(widgets));
+ Check.ArgumentNotNull(containers, nameof(containers));
+ Check.ArgumentNotNull(templateName, nameof(templateName));
IApplicationDefinition appDef = new ApplicationDefinitionType()
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypeDescriptor.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypeDescriptor.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypeDescriptor.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -39,8 +39,8 @@
/// <param name="ver">The ver.</param>
public ResourceTypeDescriptor(string resType, string ver)
{
- Check.ArgumentNotEmpty(resType, "resType"); //NOXLATE
- Check.ArgumentNotEmpty(ver, "ver"); //NOXLATE
+ Check.ArgumentNotEmpty(resType, nameof(resType));
+ Check.ArgumentNotEmpty(ver, nameof(ver));
this.ResourceType = resType;
this.Version = ver;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/SymbolDefinitionInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/SymbolDefinitionInterfaces.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/SymbolDefinitionInterfaces.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -148,7 +148,7 @@
/// <returns></returns>
public static IParameter GetParameter(this ISymbolDefinitionBase sym, string identifier)
{
- Check.ArgumentNotNull(sym, "sym"); //NOXLATE
+ Check.ArgumentNotNull(sym, nameof(sym));
return sym.GetParameters().FirstOrDefault(x => x.Identifier == identifier);
}
@@ -159,7 +159,7 @@
/// <returns></returns>
public static IEnumerable<IParameter> GetParameters(this ISymbolDefinitionBase sym)
{
- Check.ArgumentNotNull(sym, "sym"); //NOXLATE
+ Check.ArgumentNotNull(sym, nameof(sym));
if (sym.Type == SymbolDefinitionType.Simple)
return ((ISimpleSymbolDefinition)sym).GetParameters();
else
@@ -173,7 +173,7 @@
/// <returns></returns>
public static IEnumerable<IParameter> GetParameters(this ISimpleSymbolDefinition ssym)
{
- Check.ArgumentNotNull(ssym, "ssym");
+ Check.ArgumentNotNull(ssym, nameof(ssym));
return ssym.ParameterDefinition.Parameter;
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/TileSetDefinition/TileSetInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/TileSetDefinition/TileSetInterfaces.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/TileSetDefinition/TileSetInterfaces.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -1,23 +1,23 @@
-#region Disclaimer / License
-
-// Copyright (C) 2014, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
+#region Disclaimer / License
+
+// Copyright (C) 2014, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
#endregion Disclaimer / License
using OSGeo.MapGuide.ObjectModels.Common;
@@ -148,7 +148,7 @@
/// <returns></returns>
public static int GetBaseLayerCount(this ITileSetAbstract map)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
return map.BaseMapLayerGroups.SelectMany(g => g.BaseMapLayer).Count();
}
@@ -159,7 +159,7 @@
/// <returns></returns>
public static double GetMinScale(this ITileSetAbstract map)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
if (map.ScaleCount == 0)
return 0.0;
@@ -173,7 +173,7 @@
/// <returns></returns>
public static double GetMaxScale(this ITileSetAbstract map)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
if (map.ScaleCount == 0)
return 0.0;
@@ -188,7 +188,7 @@
/// <returns></returns>
public static IBaseMapGroup GetGroupForLayer(this ITileSetAbstract map, IBaseMapLayer layer)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
foreach (var group in map.BaseMapLayerGroups)
{
foreach (var tl in group.BaseMapLayer)
@@ -207,7 +207,7 @@
/// <returns></returns>
public static bool HasLayers(this IBaseMapGroup grp)
{
- Check.ArgumentNotNull(grp, "grp"); //NOXLATE
+ Check.ArgumentNotNull(grp, nameof(grp));
return new List<IBaseMapLayer>(grp.BaseMapLayer).Count > 0;
}
@@ -218,7 +218,7 @@
/// <returns></returns>
public static bool HasLayers(this ITileSetAbstract map)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
if (!map.HasGroups())
return false;
@@ -237,7 +237,7 @@
/// <returns></returns>
public static bool HasGroups(this ITileSetAbstract map)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
return new List<IBaseMapGroup>(map.BaseMapLayerGroups).Count > 0;
}
@@ -248,7 +248,7 @@
/// <returns></returns>
public static IBaseMapGroup GetFirstGroup(this ITileSetAbstract map)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
var list = new List<IBaseMapGroup>(map.BaseMapLayerGroups);
if (list.Count > 0)
return list[0];
@@ -263,8 +263,8 @@
/// <returns></returns>
public static IBaseMapLayer GetBaseLayerByName(this ITileSetAbstract map, string layerName)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
- Check.ArgumentNotEmpty(layerName, "layerName"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
+ Check.ArgumentNotEmpty(layerName, nameof(layerName));
foreach (var group in map.BaseMapLayerGroups)
{
@@ -285,8 +285,8 @@
/// <returns></returns>
public static bool LayerExists(this ITileSetAbstract map, string layerName)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
- Check.ArgumentNotEmpty(layerName, "layerName"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
+ Check.ArgumentNotEmpty(layerName, nameof(layerName));
return map.GetBaseLayerByName(layerName) != null;
}
@@ -299,8 +299,8 @@
/// <returns></returns>
public static IBaseMapGroup GetGroup(this ITileSetAbstract map, string groupName)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
- Check.ArgumentNotEmpty(groupName, "groupName"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
+ Check.ArgumentNotEmpty(groupName, nameof(groupName));
foreach (var group in map.BaseMapLayerGroups)
{
if (groupName.Equals(group.Name))
@@ -317,8 +317,8 @@
/// <returns></returns>
public static bool GroupExists(this ITileSetAbstract map, string groupName)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
- Check.ArgumentNotEmpty(groupName, "groupName"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
+ Check.ArgumentNotEmpty(groupName, nameof(groupName));
foreach (var group in map.BaseMapLayerGroups)
{
if (groupName.Equals(group.Name))
@@ -335,8 +335,8 @@
/// <returns></returns>
public static IEnumerable<IBaseMapLayer> GetLayersForGroup(this ITileSetAbstract map, string groupName)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
- Check.ArgumentNotEmpty(groupName, "groupName"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
+ Check.ArgumentNotEmpty(groupName, nameof(groupName));
foreach (var group in map.BaseMapLayerGroups)
{
@@ -357,7 +357,7 @@
/// <param name="bDetachIfEmpty"></param>
public static void RemoveBaseLayerGroup(this ITileSetDefinition map, IBaseMapGroup group)
{
- Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, nameof(map));
if (null == group)
return;
@@ -372,8 +372,8 @@
/// <returns></returns>
public static bool GroupExists(this ITileSetDefinition tileSet, string groupName)
{
- Check.ArgumentNotNull(tileSet, "map"); //NOXLATE
- Check.ArgumentNotEmpty(groupName, "groupName"); //NOXLATE
+ Check.ArgumentNotNull(tileSet, nameof(tileSet));
+ Check.ArgumentNotEmpty(groupName, nameof(groupName));
foreach (var group in tileSet.BaseMapLayerGroups)
{
if (groupName.Equals(group.Name))
@@ -390,7 +390,7 @@
/// <returns></returns>
public static INameStringPair GetParameter(this ITileSetDefinition tileSet, string name)
{
- Check.ArgumentNotNull(tileSet, "tileSet"); //NOXLATE
+ Check.ArgumentNotNull(tileSet, nameof(tileSet));
return tileSet.TileStoreParameters.Parameters.FirstOrDefault(p => p.Name == name);
}
@@ -402,7 +402,7 @@
/// <returns></returns>
public static string GetDefaultCoordinateSystem(this ITileSetDefinition tileSet)
{
- Check.ArgumentNotNull(tileSet, "tileSet"); //NOXLATE
+ Check.ArgumentNotNull(tileSet, nameof(tileSet));
var p = tileSet.GetParameter("CoordinateSystem"); //NOXLATE
if (p != null)
@@ -417,8 +417,8 @@
/// <param name="coordinateSystem"></param>
public static void SetDefaultCoordinateSystem(this ITileSetDefinition tileSet, string coordinateSystem)
{
- Check.ArgumentNotNull(tileSet, "tileSet"); //NOXLATE
- Check.ArgumentNotEmpty(coordinateSystem, "coordinateSystem"); //NOXLATE
+ Check.ArgumentNotNull(tileSet, nameof(tileSet));
+ Check.ArgumentNotEmpty(coordinateSystem, nameof(coordinateSystem));
if (tileSet.TileStoreParameters.TileProvider != "Default") //NOXLATE
throw new InvalidOperationException(string.Format(Strings.ParameterNotApplicableForTileProvider, "CoordinateSystem", tileSet.TileStoreParameters.TileProvider));
@@ -433,7 +433,7 @@
/// <returns></returns>
public static double[] GetDefaultFiniteScaleList(this ITileSetDefinition tileSet)
{
- Check.ArgumentNotNull(tileSet, "tileSet"); //NOXLATE
+ Check.ArgumentNotNull(tileSet, nameof(tileSet));
var p = tileSet.GetParameter("FiniteScaleList"); //NOXLATE
if (p != null && !string.IsNullOrEmpty(p.Value))
return p.Value.Split(',').Select(x => x.Trim()).Select(x => Convert.ToDouble(x)).OrderBy(s => s).ToArray();
@@ -447,8 +447,8 @@
/// <param name="scales"></param>
public static void SetDefaultFiniteScaleList(this ITileSetDefinition tileSet, IEnumerable<double> scales)
{
- Check.ArgumentNotNull(tileSet, "tileSet"); //NOXLATE
- Check.ArgumentNotNull(scales, "scales"); //NOXLATE
+ Check.ArgumentNotNull(tileSet, nameof(tileSet));
+ Check.ArgumentNotNull(scales, nameof(scales));
if (tileSet.TileStoreParameters.TileProvider != "Default") //NOXLATE
throw new InvalidOperationException(string.Format(Strings.ParameterNotApplicableForTileProvider, "FiniteScaleList", tileSet.TileStoreParameters.TileProvider)); //NOXLATE
@@ -464,7 +464,7 @@
/// <returns></returns>
public static string GetTilePath(this ITileSetDefinition tileSet)
{
- Check.ArgumentNotNull(tileSet, "tileSet"); //NOXLATE
+ Check.ArgumentNotNull(tileSet, nameof(tileSet));
var p = tileSet.GetParameter("TilePath"); //NOXLATE
if (p != null)
return p.Value;
@@ -478,8 +478,8 @@
/// <param name="path"></param>
public static void SetTilePath(this ITileSetDefinition tileSet, string path)
{
- Check.ArgumentNotNull(tileSet, "tileSet"); //NOXLATE
- Check.ArgumentNotEmpty(path, "path"); //NOXLATE
+ Check.ArgumentNotNull(tileSet, nameof(tileSet));
+ Check.ArgumentNotEmpty(path, nameof(path));
tileSet.TileStoreParameters.SetParameter("TilePath", path); //NOXLATE
}
@@ -490,7 +490,7 @@
/// <returns></returns>
public static int? GetDefaultTileWidth(this ITileSetDefinition tileSet)
{
- Check.ArgumentNotNull(tileSet, "tileSet"); //NOXLATE
+ Check.ArgumentNotNull(tileSet, nameof(tileSet));
var p = tileSet.GetParameter("TileWidth"); //NOXLATE
if (p != null)
return Convert.ToInt32(p.Value);
@@ -504,7 +504,7 @@
/// <param name="value"></param>
public static void SetDefaultTileWidth(this ITileSetDefinition tileSet, int value)
{
- Check.ArgumentNotNull(tileSet, "tileSet"); //NOXLATE
+ Check.ArgumentNotNull(tileSet, nameof(tileSet));
if (tileSet.TileStoreParameters.TileProvider == "XYZ") //NOXLATE
throw new InvalidOperationException(string.Format(Strings.ParameterNotApplicableForTileProvider, "TileWidth", "XYZ")); //NOXLATE
tileSet.TileStoreParameters.SetParameter("TileWidth", value.ToString(CultureInfo.InvariantCulture)); //NOXLATE
@@ -517,7 +517,7 @@
/// <returns></returns>
public static int? GetDefaultTileHeight(this ITileSetDefinition tileSet)
{
- Check.ArgumentNotNull(tileSet, "tileSet"); //NOXLATE
+ Check.ArgumentNotNull(tileSet, nameof(tileSet));
var p = tileSet.GetParameter("TileHeight"); //NOXLATE
if (p != null)
return Convert.ToInt32(p.Value);
@@ -531,7 +531,7 @@
/// <param name="value"></param>
public static void SetDefaultTileHeight(this ITileSetDefinition tileSet, int value)
{
- Check.ArgumentNotNull(tileSet, "tileSet"); //NOXLATE
+ Check.ArgumentNotNull(tileSet, nameof(tileSet));
if (tileSet.TileStoreParameters.TileProvider == "XYZ")
throw new InvalidOperationException(string.Format(Strings.ParameterNotApplicableForTileProvider, "TileHeight", "XYZ")); //NOXLATE
tileSet.TileStoreParameters.SetParameter("TileHeight", value.ToString(CultureInfo.InvariantCulture)); //NOXLATE
@@ -544,7 +544,7 @@
/// <returns></returns>
public static string GetTileFormat(this ITileSetDefinition tileSet)
{
- Check.ArgumentNotNull(tileSet, "tileSet"); //NOXLATE
+ Check.ArgumentNotNull(tileSet, nameof(tileSet));
var p = tileSet.GetParameter("TileFormat"); //NOXLATE
if (p != null)
return p.Value;
@@ -558,8 +558,8 @@
/// <param name="format"></param>
public static void SetTileFormat(this ITileSetDefinition tileSet, string format)
{
- Check.ArgumentNotNull(tileSet, "tileSet"); //NOXLATE
- Check.ArgumentNotEmpty(format, "format"); //NOXLATE
+ Check.ArgumentNotNull(tileSet, nameof(tileSet));
+ Check.ArgumentNotEmpty(format, nameof(format));
tileSet.TileStoreParameters.SetParameter("TileFormat", format); //NOXLATE
}
@@ -573,7 +573,7 @@
string tileFormat = "PNG",
string tilePath = "%MG_TILE_CACHE_PATH%")
{
- Check.ArgumentNotNull(tileSet, "tileSet"); //NOXLATE
+ Check.ArgumentNotNull(tileSet, nameof(tileSet));
var param = tileSet.TileStoreParameters;
param.TileProvider = "XYZ"; //NOXLATE
@@ -601,7 +601,7 @@
string tileFormat = "PNG", //NOXLATE
string tilePath = "%MG_TILE_CACHE_PATH%") //NOXLATE
{
- Check.ArgumentNotNull(tileSet, "tileSet"); //NOXLATE
+ Check.ArgumentNotNull(tileSet, nameof(tileSet));
var param = tileSet.TileStoreParameters;
param.TileProvider = "Default"; //NOXLATE
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/WatermarkCollectionUtil.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/WatermarkCollectionUtil.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/WatermarkCollectionUtil.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -31,7 +31,7 @@
{
public static IWatermark AddWatermark<T>(IList<T> collection, IWatermarkDefinition watermark) where T : class, IWatermark, new()
{
- Check.ArgumentNotNull(watermark, "watermark"); //NOXLATE
+ Check.ArgumentNotNull(watermark, nameof(watermark));
T impl = new T();
impl.ResourceId = watermark.ResourceID;
impl.Name = ResourceIdentifier.GetName(impl.ResourceId);
@@ -42,7 +42,7 @@
public static void RemoveWatermark<T>(IList<T> collection, IWatermark watermark) where T : class, IWatermark
{
- Check.ArgumentNotNull(watermark, "watermark"); //NOXLATE
+ Check.ArgumentNotNull(watermark, nameof(watermark));
T impl = watermark as T;
if (impl != null)
collection.Remove(impl);
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/WebLayoutInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/WebLayoutInterfaces.cs 2015-07-14 11:32:49 UTC (rev 8711)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/WebLayoutInterfaces.cs 2015-07-21 16:18:54 UTC (rev 8712)
@@ -805,8 +805,8 @@
/// <param name="items"></param>
public static void AddItems(this IMenu mnu, params IUIItem[] items)
{
- Check.ArgumentNotNull(mnu, "mnu"); //NOXLATE
- Check.ArgumentNotNull(items, "items"); //NOXLATE
+ Check.ArgumentNotNull(mnu, nameof(mnu));
+ Check.ArgumentNotNull(items, nameof(items));
foreach (var item in items)
{
mnu.AddItem(item);
More information about the mapguide-commits
mailing list