[mapguide-commits] r8478 - in trunk/Tools/Maestro: . Maestro.Base/Commands/SiteExplorer Maestro.Base/Services Maestro.Editors/Fusion Maestro.Editors/LayerDefinition/Vector/Scales Maestro.Editors/MapDefinition Maestro.Editors/SymbolDefinition 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.MaestroAPI.Tests 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/SymbolDefinition OSGeo.MapGuide.ObjectModels/WatermarkDefinition OSGeo.MapGuide.ObjectModels/WebLayout
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Dec 28 17:41:22 PST 2014
Author: jng
Date: 2014-12-28 17:41:22 -0800 (Sun, 28 Dec 2014)
New Revision: 8478
Added:
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/CheckTests.cs
Modified:
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/Fusion/FlexibleLayoutEditorContext.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs
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/SymbolDefinition/SymbolField.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/ResourceTests.cs
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/Utility.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/WeakEventHandler.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/OSGeo.MapGuide.ObjectModel.Tests.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/ApplicationDefinitionInterfaces.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Check.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/ResourceTypeDescriptor.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/SymbolDefinitionInterfaces.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/WatermarkCollectionUtil.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/WebLayoutInterfaces.cs
trunk/Tools/Maestro/UnitTests.playlist
Log:
Remove and cleanup method names in Check utility class. Add Check tests cases to test suite.
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DeleteSelectedItemsCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DeleteSelectedItemsCommand.cs 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DeleteSelectedItemsCommand.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -131,8 +131,8 @@
private static bool ConfirmDeleteOpenResources(RepositoryItem[] items, Maestro.Base.Editor.IEditorViewContent[] editors)
{
- Check.NotNull(items, "items"); //NOXLATE
- Check.NotNull(editors, "editors"); //NOXLATE
+ Check.ArgumentNotNull(items, "items"); //NOXLATE
+ Check.ArgumentNotNull(editors, "editors"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/Maestro.Base/Services/ClipboardService.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -87,7 +87,7 @@
internal RepositoryItem.ClipboardAction GetClipboardState(string resId)
{
- Check.NotEmpty(resId, "resId");
+ Check.ArgumentNotEmpty(resId, "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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -132,10 +132,10 @@
internal void RenameResourceId(string oldId, string newId, IServerConnection conn, ISiteExplorer siteExp)
{
- Check.NotEmpty(oldId, "oldId"); //NOXLATE
- Check.NotEmpty(newId, "newId"); //NOXLATE
- Check.NotNull(siteExp, "siteExp"); //NOXLATE
- Check.NotNull(conn, "conn"); //NOXLATE
+ Check.ArgumentNotEmpty(oldId, "oldId"); //NOXLATE
+ Check.ArgumentNotEmpty(newId, "newId"); //NOXLATE
+ Check.ArgumentNotNull(siteExp, "siteExp"); //NOXLATE
+ Check.ArgumentNotNull(conn, "conn"); //NOXLATE
string oldKey = ComputeResourceKey(oldId, conn);
string newKey = ComputeResourceKey(newId, conn);
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditorContext.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditorContext.cs 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditorContext.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -59,7 +59,7 @@
/// <returns></returns>
public IWidgetInfo GetWidgetInfo(string name)
{
- Check.NotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotEmpty(name, "name"); //NOXLATE
foreach (var wgt in _widgetSet.WidgetInfo)
{
if (name.Equals(wgt.Type))
@@ -84,7 +84,7 @@
/// <returns></returns>
public IApplicationDefinitionContainerInfo GetContainerInfo(string name)
{
- Check.NotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotEmpty(name, "name"); //NOXLATE
foreach (var cnt in _containerSet.ContainerInfo)
{
if (name.Equals(cnt.Type))
@@ -100,7 +100,7 @@
/// <returns></returns>
public IApplicationDefinitionTemplateInfo GetTemplateInfo(string name)
{
- Check.NotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotEmpty(name, "name"); //NOXLATE
foreach (var tpl in _templateSet.TemplateInfo)
{
if (name.Equals(tpl.Name))
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -676,7 +676,7 @@
private Control CreateSymbolDefinitionEditor(ISymbolInstance symRef)
{
- Check.NotNull(symRef, "symRef"); //NOXLATE
+ Check.ArgumentNotNull(symRef, "symRef"); //NOXLATE
if (symRef.Reference.Type == SymbolInstanceType.Reference)
{
return new ReferenceCtrl((ISymbolInstanceReferenceLibrary)symRef.Reference, _edSvc);
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ExtentCalculationDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ExtentCalculationDialog.cs 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ExtentCalculationDialog.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -163,7 +163,7 @@
}
}
- Check.NotNull(layers, "layers");
+ Check.ArgumentNotNull(layers, "layers");
int processed = 0;
//Begin
@@ -215,7 +215,7 @@
private string ExtentsToString(IEnvelope env)
{
- Check.NotNull(env, "env");
+ Check.ArgumentNotNull(env, "env");
return string.Format("[{0} {1}] [{2} {3}]", env.MinX, env.MinY, env.MaxX, env.MaxY);
}
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -1162,8 +1162,8 @@
private static string GenerateLayerName(string layerId, IMapDefinition baseMapDef)
{
- Check.NotNull(baseMapDef, "baseMapDef");
- Check.NotEmpty(layerId, "layerId");
+ Check.ArgumentNotNull(baseMapDef, "baseMapDef");
+ Check.ArgumentNotEmpty(layerId, "layerId");
int counter = 0;
string prefix = ResourceIdentifier.GetName(layerId);
@@ -1183,8 +1183,8 @@
private static string GenerateBaseLayerName(string layerId, IBaseMapDefinition baseMapDef)
{
- Check.NotNull(baseMapDef, "baseMapDef");
- Check.NotEmpty(layerId, "layerId");
+ Check.ArgumentNotNull(baseMapDef, "baseMapDef");
+ Check.ArgumentNotEmpty(layerId, "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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ScaleListGenerator.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -44,8 +44,8 @@
{
public static double[] GenerateScales(double minScale, double maxScale, ScaleGenerationMethod method, ScaleRoundingMethod rounding, int scaleCount)
{
- Check.Precondition(minScale < maxScale, "minScale < maxScale");
- Check.Precondition(scaleCount > 0, "scaleCount > 0");
+ Check.ThatPreconditionIsMet(minScale < maxScale, "minScale < maxScale");
+ Check.ThatPreconditionIsMet(scaleCount > 0, "scaleCount > 0");
List<double> vals = new List<double>();
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolField.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolField.cs 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolField.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -319,7 +319,7 @@
public void Bind(object dataSource, string propertyName)
{
Check.ArgumentNotNull(dataSource, "dataSource");
- Check.NotEmpty(propertyName, "member");
+ Check.ArgumentNotEmpty(propertyName, "member");
try
{
_isBinding = true;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/ConnectionCapabilities.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/ConnectionCapabilities.cs 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/ConnectionCapabilities.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -287,7 +287,7 @@
/// <returns></returns>
public virtual bool IsSupportedResourceType(string resourceType)
{
- Check.NotEmpty(resourceType, "resourceType"); //NOXLATE
+ Check.ArgumentNotEmpty(resourceType, "resourceType"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemBase.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -43,13 +43,13 @@
public static CoordinateSystemBase Create(CoordinateSystemDefinitionBase csDef)
{
- Check.NotNull(csDef, "csDef");
+ Check.ArgumentNotNull(csDef, "csDef");
return Create(csDef.WKT);
}
public static CoordinateSystemBase Create(string csWkt)
{
- Check.NotEmpty(csWkt, "csWkt");
+ Check.ArgumentNotEmpty(csWkt, "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.NotNull(bbox, "bbox");
+ Check.ArgumentNotNull(bbox, "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.NotNull(bbox, "bbox");
+ Check.ArgumentNotNull(bbox, "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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CredentialWriter.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -62,7 +62,7 @@
/// <returns></returns>
public static string GetEncryptedUsername(this IFeatureSource fs, IServerConnection conn)
{
- Check.NotNull(fs, "fs"); //NOXLATE
+ Check.ArgumentNotNull(fs, "fs"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceMigrator.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -97,9 +97,9 @@
/// <returns></returns>
public string[] CopyResources(string[] sourceResourceIds, string[] targetResourceIds, bool overwrite, RebaseOptions options, LengthyOperationProgressCallBack callback)
{
- Check.NotNull(sourceResourceIds, "sourceResourceIds"); //NOXLATE
- Check.NotNull(targetResourceIds, "targetResourceIds"); //NOXLATE
- Check.Precondition(sourceResourceIds.Length == targetResourceIds.Length, "resourceIds.Length == targetResourceIds.Length"); //NOXLATE
+ Check.ArgumentNotNull(sourceResourceIds, "sourceResourceIds"); //NOXLATE
+ Check.ArgumentNotNull(targetResourceIds, "targetResourceIds"); //NOXLATE
+ Check.ThatPreconditionIsMet(sourceResourceIds.Length == targetResourceIds.Length, "resourceIds.Length == targetResourceIds.Length"); //NOXLATE
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.NotNull(resourceIds, "resourceIds"); //NOXLATE
- Check.NotEmpty(folderId, "folderId"); //NOXLATE
+ Check.ArgumentNotNull(resourceIds, "resourceIds"); //NOXLATE
+ Check.ArgumentNotEmpty(folderId, "folderId"); //NOXLATE
var cb = callback;
if (cb == null)
@@ -279,8 +279,8 @@
/// <returns></returns>
public int MoveResources(string[] resourceIds, string folderId, bool overwrite, LengthyOperationProgressCallBack callback)
{
- Check.NotNull(resourceIds, "resourceIds"); //NOXLATE
- Check.NotEmpty(folderId, "folderId"); //NOXLATE
+ Check.ArgumentNotNull(resourceIds, "resourceIds"); //NOXLATE
+ Check.ArgumentNotEmpty(folderId, "folderId"); //NOXLATE
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.NotEmpty(resourceId, "resourceId"); //NOXLATE
- Check.NotNull(dependentResourceIds, "dependentResourceIds"); //NOXLATE
+ Check.ArgumentNotEmpty(resourceId, "resourceId"); //NOXLATE
+ Check.ArgumentNotNull(dependentResourceIds, "dependentResourceIds"); //NOXLATE
//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.NotEmpty(resourceId, "resourceId"); //NOXLATE
+ Check.ArgumentNotEmpty(resourceId, "resourceId"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceRebaser.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -39,8 +39,8 @@
/// <param name="targetFolder">The target folder.</param>
public RebaseOptions(string sourceFolder, string targetFolder)
{
- Check.Precondition(ResourceIdentifier.IsFolderResource(sourceFolder), "ResourceIdentifier.IsFolderResource(sourceFolder)"); //NOXLATE
- Check.Precondition(ResourceIdentifier.IsFolderResource(targetFolder), "ResourceIdentifier.IsFolderResource(targetFolder)"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.IsFolderResource(sourceFolder), "ResourceIdentifier.IsFolderResource(sourceFolder)"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.IsFolderResource(targetFolder), "ResourceIdentifier.IsFolderResource(targetFolder)"); //NOXLATE
this.SourceFolder = sourceFolder;
this.TargetFolder = targetFolder;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ExtensionMethods.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ExtensionMethods.cs 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ExtensionMethods.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -114,8 +114,8 @@
/// <param name="targetID">The target ID.</param>
public static void CopyResourceDataTo(this IResource source, IServerConnection conn, string targetID)
{
- Check.NotNull(source, "source"); //NOXLATE
- Check.NotEmpty(targetID, "targetID"); //NOXLATE
+ Check.ArgumentNotNull(source, "source"); //NOXLATE
+ Check.ArgumentNotEmpty(targetID, "targetID"); //NOXLATE
var resData = conn.ResourceService.EnumerateResourceData(source.ResourceID);
foreach (var res in resData.ResourceData)
@@ -243,7 +243,7 @@
{
Check.ArgumentNotNull(source, "source"); //NOXLATE
Check.ArgumentNotNull(conn, "conn"); //NOXLATE
- Check.NotEmpty(source.ResourceID, "source.ResourceID"); //NOXLATE
+ Check.ArgumentNotEmpty(source.ResourceID, "source.ResourceID"); //NOXLATE
IDrawingService dwSvc = (IDrawingService)conn.GetService((int)ServiceType.Drawing);
var sheets = dwSvc.EnumerateDrawingSections(source.ResourceID);
@@ -268,7 +268,7 @@
{
Check.ArgumentNotNull(source, "source"); //NOXLATE
Check.ArgumentNotNull(conn, "conn"); //NOXLATE
- Check.NotEmpty(source.ResourceID, "source.ResourceID"); //NOXLATE
+ Check.ArgumentNotEmpty(source.ResourceID, "source.ResourceID"); //NOXLATE
//Need drawing service
if (Array.IndexOf(conn.Capabilities.SupportedServices, (int)ServiceType.Drawing) < 0)
@@ -353,8 +353,8 @@
/// <returns></returns>
public static IFdoSpatialContext GetSpatialContext(this ILayerDefinition layer, IServerConnection conn)
{
- Check.NotNull(layer, "layer"); //NOXLATE
- Check.NotNull(conn, "conn"); //NOXLATE
+ Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(conn, "conn"); //NOXLATE
var ltype = layer.SubLayer.LayerType;
if (ltype == LayerType.Vector ||
ltype == LayerType.Raster)
@@ -410,8 +410,8 @@
public static IEnvelope GetSpatialExtent(this ILayerDefinition layer, IServerConnection conn, bool allowFallbackToContextInformation, out string csWkt)
{
csWkt = null;
- Check.NotNull(layer, "layer"); //NOXLATE
- Check.NotNull(conn, "conn"); //NOXLATE
+ Check.ArgumentNotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(conn, "conn"); //NOXLATE
switch (layer.SubLayer.LayerType)
{
@@ -529,7 +529,7 @@
/// <returns></returns>
public static ICompositeRule CreateDefaultPointCompositeRule(this ILayerElementFactory fact)
{
- Check.NotNull(fact, "fact");
+ Check.ArgumentNotNull(fact, "fact");
var rule = fact.CreateDefaultCompositeRule();
//Clear out existing instances
rule.CompositeSymbolization.RemoveAllSymbolInstances();
@@ -585,7 +585,7 @@
/// <returns></returns>
public static ICompositeRule CreateDefaultLineCompositeRule(this ILayerElementFactory fact)
{
- Check.NotNull(fact, "fact");
+ Check.ArgumentNotNull(fact, "fact");
var rule = fact.CreateDefaultCompositeRule();
//Clear out existing instances
rule.CompositeSymbolization.RemoveAllSymbolInstances();
@@ -636,7 +636,7 @@
/// <returns></returns>
public static ICompositeRule CreateDefaultAreaCompositeRule(this ILayerElementFactory fact)
{
- Check.NotNull(fact, "fact");
+ Check.ArgumentNotNull(fact, "fact");
var rule = fact.CreateDefaultCompositeRule();
//Clear out existing instances
rule.CompositeSymbolization.RemoveAllSymbolInstances();
@@ -713,7 +713,7 @@
/// <returns></returns>
public static ICompositeTypeStyle CreateDefaultPointCompositeStyle(this ILayerElementFactory fact)
{
- Check.NotNull(fact, "fact");
+ Check.ArgumentNotNull(fact, "fact");
var style = fact.CreateDefaultCompositeStyle();
style.RemoveAllRules();
style.AddCompositeRule(fact.CreateDefaultPointCompositeRule());
@@ -727,7 +727,7 @@
/// <returns></returns>
public static ICompositeTypeStyle CreateDefaultLineCompositeStyle(this ILayerElementFactory fact)
{
- Check.NotNull(fact, "fact");
+ Check.ArgumentNotNull(fact, "fact");
var style = fact.CreateDefaultCompositeStyle();
style.RemoveAllRules();
style.AddCompositeRule(fact.CreateDefaultLineCompositeRule());
@@ -741,7 +741,7 @@
/// <returns></returns>
public static ICompositeTypeStyle CreateDefaultAreaCompositeStyle(this ILayerElementFactory fact)
{
- Check.NotNull(fact, "fact");
+ Check.ArgumentNotNull(fact, "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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMap.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -1110,7 +1110,7 @@
[Obsolete("Use the indexer of the Groups property instead")] //NOXLATE
public RuntimeMapGroup GetGroupByName(string name)
{
- Check.NotNull(name, "name"); //NOXLATE
+ Check.ArgumentNotNull(name, "name"); //NOXLATE
return this.Groups[name];
}
@@ -1154,7 +1154,7 @@
/// <returns></returns>
public int IndexOfLayer(string layerName)
{
- Check.NotEmpty(layerName, "layerName"); //NOXLATE
+ Check.ArgumentNotEmpty(layerName, "layerName"); //NOXLATE
var layer = this.Layers[layerName];
return this.Layers.IndexOf(layer);
@@ -1197,7 +1197,7 @@
/// <returns></returns>
public RuntimeMapLayer[] GetLayersOfGroup(string groupName)
{
- Check.NotEmpty(groupName, "groupName"); //NOXLATE
+ Check.ArgumentNotEmpty(groupName, "groupName"); //NOXLATE
List<RuntimeMapLayer> layers = new List<RuntimeMapLayer>();
foreach (var lyr in this.Layers)
{
@@ -1214,7 +1214,7 @@
/// <returns></returns>
public RuntimeMapGroup[] GetGroupsOfGroup(string groupName)
{
- Check.NotEmpty(groupName, "groupName"); //NOXLATE
+ Check.ArgumentNotEmpty(groupName, "groupName"); //NOXLATE
List<RuntimeMapGroup> groups = new List<RuntimeMapGroup>();
foreach (var grp in this.Groups)
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -75,7 +75,7 @@
/// <returns></returns>
public static RuntimeMapGroup GetParentGroup(this RuntimeMapLayer layer)
{
- Check.NotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, "layer"); //NOXLATE
if (string.IsNullOrEmpty(layer.Group))
return null;
@@ -131,7 +131,7 @@
/// <param name="suppressErrors"></param>
protected void Initialize(ILayerDefinition ldf, bool suppressErrors)
{
- Check.NotNull(ldf, "ldf"); //NOXLATE
+ Check.ArgumentNotNull(ldf, "ldf"); //NOXLATE
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.NotNull(source, "source"); //NOXLATE
- Check.NotNull(ldf, "ldf"); //NOXLATE
- Check.Precondition(source.ResourceId == ldf.ResourceID, "source.ResourceId == ldf.ResourceID"); //NOXLATE
+ Check.ArgumentNotNull(source, "source"); //NOXLATE
+ Check.ArgumentNotNull(ldf, "ldf"); //NOXLATE
+ Check.ThatPreconditionIsMet(source.ResourceId == ldf.ResourceID, "source.ResourceId == ldf.ResourceID"); //NOXLATE
}
private void EnsureOrderedMinMaxScales()
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -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.NotEmpty(schema, "schema"); //NOXLATE
- Check.NotEmpty(geometry, "geometry"); //NOXLATE
+ Check.ArgumentNotEmpty(schema, "schema"); //NOXLATE
+ Check.ArgumentNotEmpty(geometry, "geometry"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Conversion/ImageSymbolConverter.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -50,18 +50,18 @@
/// <param name="symbolLibId"></param>
public ImageSymbolConverter(IServerConnection conn, string symbolLibId)
{
- Check.NotNull(conn, "conn"); //NOXLATE
- Check.NotEmpty(symbolLibId, "symbolLibId"); //NOXLATE
- Check.Precondition(ResourceIdentifier.GetResourceTypeAsString(symbolLibId) == ResourceTypes.SymbolLibrary.ToString(), "ResourceIdentifier.GetResourceTypeAsString(symbolLibId) == ResourceTypes.SymbolLibrary.ToString()"); //NOXLATE
- Check.Precondition(Array.IndexOf(conn.Capabilities.SupportedServices, (int)ServiceType.Drawing) >= 0, "Array.IndexOf(conn.Capabilities.SupportedServices, (int)ServiceType.Drawing) >= 0"); //NOXLATE
+ 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
_symbolLibId = symbolLibId;
_conn = conn;
}
public void ExtractSymbols(string targetFolder, IEnumerable<string> symbols, Action<int, int> progressCallback)
{
- Check.NotEmpty(targetFolder, "targetFolder"); //NOXLATE
- Check.Precondition(ResourceIdentifier.IsFolderResource(targetFolder), "ResourceIdentifier.IsFolderResource(targetFolder)"); //NOXLATE
+ Check.ArgumentNotEmpty(targetFolder, "targetFolder"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.IsFolderResource(targetFolder), "ResourceIdentifier.IsFolderResource(targetFolder)"); //NOXLATE
if (symbols == null)
{
@@ -106,8 +106,8 @@
/// <param name="targetFolder"></param>
public void ExtractSymbols(string targetFolder)
{
- Check.NotEmpty(targetFolder, "targetFolder"); //NOXLATE
- Check.Precondition(ResourceIdentifier.IsFolderResource(targetFolder), "ResourceIdentifier.IsFolderResource(targetFolder)"); //NOXLATE
+ Check.ArgumentNotEmpty(targetFolder, "targetFolder"); //NOXLATE
+ Check.ThatPreconditionIsMet(ResourceIdentifier.IsFolderResource(targetFolder), "ResourceIdentifier.IsFolderResource(targetFolder)"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/IResourceValidator.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -65,8 +65,8 @@
/// <param name="msg">The message.</param>
public ValidationIssue(IResource res, ValidationStatus stat, ValidationStatusCode code, string msg)
{
- Check.NotNull(res, "res"); //NOXLATE
- Check.NotEmpty(msg, "msg"); //NOXLATE
+ Check.ArgumentNotNull(res, "res"); //NOXLATE
+ Check.ArgumentNotEmpty(msg, "msg"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLayerDefinitionValidator.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -70,7 +70,7 @@
/// <returns></returns>
protected ValidationIssue[] ValidateBase(ResourceValidationContext context, IResource resource, bool recurse)
{
- Check.NotNull(context, "context"); //NOXLATE
+ Check.ArgumentNotNull(context, "context"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLoadProcedureValidator.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -46,7 +46,7 @@
/// <returns></returns>
protected static ValidationIssue[] ValidateBase(ResourceValidationContext context, IResource resource, bool recurse)
{
- Check.NotNull(context, "context"); //NOXLATE
+ Check.ArgumentNotNull(context, "context"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseMapDefinitionValidator.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -72,7 +72,7 @@
/// <returns></returns>
protected ValidationIssue[] ValidateBase(ResourceValidationContext context, IResource resource, bool recurse)
{
- Check.NotNull(context, "context"); //NOXLATE
+ Check.ArgumentNotNull(context, "context"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseSymbolDefinitionValidator.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -43,7 +43,7 @@
/// <returns></returns>
protected ValidationIssue[] ValidateBase(ResourceValidationContext context, IResource resource, bool recurse)
{
- Check.NotNull(context, "context"); //NOXLATE
+ Check.ArgumentNotNull(context, "context"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseWebLayoutValidator.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -53,7 +53,7 @@
/// <returns></returns>
protected static ValidationIssue[] ValidateBase(ResourceValidationContext context, IResource resource, bool recurse)
{
- Check.NotNull(context, "context"); //NOXLATE
+ Check.ArgumentNotNull(context, "context"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/DrawingSourceValidator.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -53,7 +53,7 @@
/// <returns></returns>
public ValidationIssue[] Validate(ResourceValidationContext context, IResource resource, bool recurse)
{
- Check.NotNull(context, "context"); //NOXLATE
+ Check.ArgumentNotNull(context, "context"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/FeatureSourceValidator.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -57,7 +57,7 @@
/// <returns></returns>
public ValidationIssue[] Validate(ResourceValidationContext context, IResource resource, bool recurse)
{
- Check.NotNull(context, "context"); //NOXLATE
+ Check.ArgumentNotNull(context, "context"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/PrintLayoutValidator.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -53,7 +53,7 @@
/// <returns></returns>
public ValidationIssue[] Validate(ResourceValidationContext context, IResource resource, bool recurse)
{
- Check.NotNull(context, "context"); //NOXLATE
+ Check.ArgumentNotNull(context, "context"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ResourceValidatorSet.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -40,7 +40,7 @@
/// <param name="validator">The validator.</param>
public static void RegisterValidator(IResourceValidator validator)
{
- Check.NotNull(validator, "validator"); //NOXLATE
+ Check.ArgumentNotNull(validator, "validator"); //NOXLATE
if (!m_validators.Contains(validator))
m_validators.Add(validator);
@@ -55,7 +55,7 @@
/// <returns></returns>
public static ValidationIssue[] Validate(ResourceValidationContext context, IEnumerable<IResource> items, bool recurse)
{
- Check.NotNull(items, "items"); //NOXLATE
+ Check.ArgumentNotNull(items, "items"); //NOXLATE
var issues = new List<ValidationIssue>();
foreach (var item in items)
{
@@ -74,7 +74,7 @@
/// <returns></returns>
public static ValidationIssue[] Validate(ResourceValidationContext context, IResource item, bool recurse)
{
- Check.NotNull(item, "item"); //NOXLATE
+ Check.ArgumentNotNull(item, "item"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/SymbolLibraryValidator.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -53,7 +53,7 @@
/// <returns></returns>
public ValidationIssue[] Validate(ResourceValidationContext context, IResource resource, bool recurse)
{
- Check.NotNull(context, "context"); //NOXLATE
+ Check.ArgumentNotNull(context, "context"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ValidationResultSet.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -71,7 +71,7 @@
/// <returns></returns>
public ICollection<ValidationIssue> GetIssuesForResource(string resourceId)
{
- Check.NotEmpty(resourceId, "resourceId"); //NOXLATE
+ Check.ArgumentNotEmpty(resourceId, "resourceId"); //NOXLATE
if (_issues.ContainsKey(resourceId))
return _issues[resourceId].Keys;
@@ -134,9 +134,9 @@
/// <param name="issue">The issue.</param>
public void AddIssue(ValidationIssue issue)
{
- Check.NotNull(issue, "issue"); //NOXLATE
- Check.NotNull(issue.Resource, "issue.Resource"); //NOXLATE
- Check.NotEmpty(issue.Resource.ResourceID, "issue.Resource.ResourceID"); //NOXLATE
+ Check.ArgumentNotNull(issue, "issue"); //NOXLATE
+ Check.ArgumentNotNull(issue.Resource, "issue.Resource"); //NOXLATE
+ Check.ArgumentNotEmpty(issue.Resource.ResourceID, "issue.Resource.ResourceID"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/ClassDefinition.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -58,7 +58,7 @@
: this()
{
Check.ArgumentNotNull(name, "name"); //NOXLATE
- Check.NotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotEmpty(name, "name"); //NOXLATE
this.Name = name;
this.Description = description;
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/FeatureSourceDescription.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/FeatureSourceDescription.cs 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/FeatureSourceDescription.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -175,7 +175,7 @@
/// <returns>The matching class definition. null if not found</returns>
public ClassDefinition GetClass(string qualifiedName)
{
- Check.NotEmpty(qualifiedName, "qualifiedName"); //NOXLATE
+ Check.ArgumentNotEmpty(qualifiedName, "qualifiedName"); //NOXLATE
var tokens = qualifiedName.Split(':'); //NOXLATE
if (tokens.Length != 2)
throw new ArgumentException(string.Format(Strings.ErrorNotAQualifiedClassName, qualifiedName));
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -1528,8 +1528,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.NotEmpty(srcId, "srcId"); //NOXLATE
- Check.NotEmpty(dstId, "dstId"); //NOXLATE
+ Check.ArgumentNotEmpty(srcId, "srcId"); //NOXLATE
+ Check.ArgumentNotEmpty(dstId, "dstId"); //NOXLATE
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.
@@ -1605,7 +1605,7 @@
public static IApplicationDefinition CreateFlexibleLayout(IServerConnection conn, string templateName)
{
- Check.Precondition(Array.IndexOf(conn.Capabilities.SupportedServices, (int)ServiceType.Fusion) >= 0, "Required Fusion service not supported on this connection");
+ Check.ThatPreconditionIsMet(Array.IndexOf(conn.Capabilities.SupportedServices, (int)ServiceType.Fusion) >= 0, "Required Fusion service not supported on this connection");
IFusionService service = (IFusionService)conn.GetService((int)ServiceType.Fusion);
var templates = service.GetApplicationTemplates();
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/WeakEventHandler.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/WeakEventHandler.cs 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/WeakEventHandler.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -65,7 +65,7 @@
public static TEventHandler Create(TEventHandler eh, Action<TEventHandler> cleanup)
{
- Check.That(eh != null && cleanup != null, "eh != null && cleanup != null");
+ Check.ThatPreconditionIsMet(eh != null && cleanup != null, "eh != null && 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.MaestroAPI.Tests/ResourceTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/ResourceTests.cs 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/ResourceTests.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -246,10 +246,10 @@
SetupMapDefinitionForTest(mdf);
int layerCount = mdf.GetLayerCount();
- Assert.Throws<ArgumentException>(() => { mdf.MoveDown(null); });
- Assert.Throws<ArgumentException>(() => { mdf.MoveUp(null); });
- Assert.Throws<ArgumentException>(() => { mdf.SetTopDrawOrder(null); });
- Assert.Throws<ArgumentException>(() => { mdf.SetBottomDrawOrder(null); });
+ Assert.Throws<ArgumentNullException>(() => { mdf.MoveDown(null); });
+ Assert.Throws<ArgumentNullException>(() => { mdf.MoveUp(null); });
+ Assert.Throws<ArgumentNullException>(() => { mdf.SetTopDrawOrder(null); });
+ Assert.Throws<ArgumentNullException>(() => { mdf.SetBottomDrawOrder(null); });
IMapLayer layer = mdf.AddLayer(null, "Hydro", "Library://UnitTests/Layers/HydrographicPolygons.LayerDefinition");
Assert.AreEqual(0, mdf.GetIndex(layer));
@@ -318,10 +318,10 @@
SetupMapDefinitionForTest(mdf);
int groupCount = mdf.GetGroupCount();
- Assert.Throws<ArgumentException>(() => { mdf.MoveDown(null); });
- Assert.Throws<ArgumentException>(() => { mdf.MoveUp(null); });
- Assert.Throws<ArgumentException>(() => { mdf.SetTopDrawOrder(null); });
- Assert.Throws<ArgumentException>(() => { mdf.SetBottomDrawOrder(null); });
+ Assert.Throws<ArgumentNullException>(() => { mdf.MoveDown(null); });
+ Assert.Throws<ArgumentNullException>(() => { mdf.MoveUp(null); });
+ Assert.Throws<ArgumentNullException>(() => { mdf.SetTopDrawOrder(null); });
+ Assert.Throws<ArgumentNullException>(() => { mdf.SetBottomDrawOrder(null); });
IMapLayerGroup group = mdf.AddGroup("Test");
Assert.AreEqual(groupCount, mdf.GetIndex(group));
Added: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/CheckTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/CheckTests.cs (rev 0)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/CheckTests.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -0,0 +1,84 @@
+#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;
+using OSGeo.MapGuide.ObjectModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace OSGeo.MapGuide.ObjectModel.Tests
+{
+ [TestFixture]
+ public class CheckTests
+ {
+ [Test]
+ public void NotNullTest()
+ {
+ Assert.Throws<ArgumentNullException>(() => Check.ArgumentNotNull<object>(null, "Test"));
+ Assert.DoesNotThrow(() => Check.ArgumentNotNull("agdsfd", "arg"));
+ }
+
+ [Test]
+ public void NotEmptyTest()
+ {
+ Assert.Throws<ArgumentException>(() => Check.ArgumentNotEmpty(null, "test"));
+ Assert.Throws<ArgumentException>(() => Check.ArgumentNotEmpty("", "test"));
+ Assert.DoesNotThrow(() => Check.ArgumentNotEmpty("agdsfd", "arg"));
+ }
+
+ [Test]
+ public void IsFolderTest()
+ {
+ Assert.Throws<ArgumentException>(() => Check.ThatArgumentIsFolder("Library://Test.FeatureSource", "test"));
+ Assert.Throws<ArgumentException>(() => Check.ThatArgumentIsFolder("Library://Test", "test"));
+ Assert.DoesNotThrow(() => Check.ThatArgumentIsFolder("Library://Test/", "test"));
+ }
+
+ [Test]
+ public void PreconditionTest()
+ {
+ Assert.Throws<ArgumentException>(() => Check.ThatPreconditionIsMet(false, "test"));
+ Assert.DoesNotThrow(() => Check.ThatPreconditionIsMet(true, "test"));
+ }
+
+ [Test]
+ public void RangeTest()
+ {
+ Assert.Throws<ArgumentException>(() => Check.ThatArgumentIsBetweenRange(1, 2, 3, false, "test"));
+ Assert.Throws<ArgumentException>(() => Check.ThatArgumentIsBetweenRange(1, 1, 1, false, "test"));
+ Assert.Throws<ArgumentException>(() => Check.ThatArgumentIsBetweenRange(1.0, 1.0, 1.0, false, "test"));
+ Assert.Throws<ArgumentException>(() => Check.ThatArgumentIsBetweenRange(1.0, 2.0, 3.0, false, "test"));
+
+ Assert.DoesNotThrow(() => Check.ThatArgumentIsBetweenRange(1, 1, 1, true, "test"));
+ Assert.DoesNotThrow(() => Check.ThatArgumentIsBetweenRange(2, 1, 3, true, "test"));
+ Assert.DoesNotThrow(() => Check.ThatArgumentIsBetweenRange(1, 1, 3, true, "test"));
+ Assert.DoesNotThrow(() => Check.ThatArgumentIsBetweenRange(3, 1, 3, true, "test"));
+ Assert.DoesNotThrow(() => Check.ThatArgumentIsBetweenRange(1.0, 1.0, 1.0, true, "test"));
+ Assert.DoesNotThrow(() => Check.ThatArgumentIsBetweenRange(2.0, 1.0, 3.0, true, "test"));
+ Assert.DoesNotThrow(() => Check.ThatArgumentIsBetweenRange(1.0, 1.0, 3.0, true, "test"));
+ Assert.DoesNotThrow(() => Check.ThatArgumentIsBetweenRange(3.0, 1.0, 3.0, true, "test"));
+ Assert.DoesNotThrow(() => Check.ThatArgumentIsBetweenRange(1.5, 1, 2, true, "test"));
+ }
+ }
+}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/OSGeo.MapGuide.ObjectModel.Tests.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/OSGeo.MapGuide.ObjectModel.Tests.csproj 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/OSGeo.MapGuide.ObjectModel.Tests.csproj 2014-12-29 01:41:22 UTC (rev 8478)
@@ -48,6 +48,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="ApplicationDefinitionTests.cs" />
+ <Compile Include="CheckTests.cs" />
<Compile Include="DrawingSourceTests.cs" />
<Compile Include="FeatureSourceTests.cs" />
<Compile Include="ObjectFactoryTests.cs" />
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/ApplicationDefinitionInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/ApplicationDefinitionInterfaces.cs 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/ApplicationDefinitionInterfaces.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -609,8 +609,8 @@
/// <returns></returns>
public static bool WidgetNameExists(this IApplicationDefinition appDef, string name)
{
- Check.NotNull(appDef, "appDef");
- Check.NotEmpty(name, "name");
+ Check.ArgumentNotNull(appDef, "appDef");
+ Check.ArgumentNotEmpty(name, "name");
return appDef.FindWidget(name) != null;
}
@@ -623,8 +623,8 @@
/// <returns></returns>
public static IWidget FindWidget(this IApplicationDefinition appDef, string name)
{
- Check.NotNull(appDef, "appDef");
- Check.NotEmpty(name, "name");
+ Check.ArgumentNotNull(appDef, "appDef");
+ Check.ArgumentNotEmpty(name, "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.NotNull(appDef, "appDef"); //NOXLATE
- Check.NotEmpty(widgetName, "widgetName"); //NOXLATE
+ Check.ArgumentNotNull(appDef, "appDef"); //NOXLATE
+ Check.ArgumentNotEmpty(widgetName, "widgetName"); //NOXLATE
IWidgetSet matchingSet = null;
IWidget matchingWidget = null;
@@ -718,8 +718,8 @@
/// <returns></returns>
public static IApplicationDefinitionContainerInfo FindContainer(this IApplicationDefinitionContainerInfoSet set, string name)
{
- Check.NotNull(set, "set"); //NOXLATE
- Check.NotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotNull(set, "set"); //NOXLATE
+ Check.ArgumentNotEmpty(name, "name"); //NOXLATE
foreach (var cnt in set.ContainerInfo)
{
@@ -737,8 +737,8 @@
/// <returns></returns>
public static IWidgetInfo FindWidget(this IApplicationDefinitionWidgetInfoSet set, string name)
{
- Check.NotNull(set, "set"); //NOXLATE
- Check.NotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotNull(set, "set"); //NOXLATE
+ Check.ArgumentNotEmpty(name, "name"); //NOXLATE
foreach (var wgt in set.WidgetInfo)
{
@@ -756,8 +756,8 @@
/// <returns></returns>
public static IApplicationDefinitionTemplateInfo FindTemplate(this IApplicationDefinitionTemplateInfoSet set, string name)
{
- Check.NotNull(set, "set"); //NOXLATE
- Check.NotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotNull(set, "set"); //NOXLATE
+ Check.ArgumentNotEmpty(name, "name"); //NOXLATE
foreach (var tpl in set.TemplateInfo)
{
@@ -775,7 +775,7 @@
/// <returns></returns>
public static IMapGroup GetGroupById(this IMapSet set, string id)
{
- Check.NotNull(set, "set"); //NOXLATE
+ Check.ArgumentNotNull(set, "set"); //NOXLATE
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.NotNull(ext, "ext"); //NOXLATE
+ Check.ArgumentNotNull(ext, "ext"); //NOXLATE
List<string> names = new List<string>();
@@ -810,7 +810,7 @@
/// <returns></returns>
public static NameValueCollection GetAllValues(this IExtensibleElement ext)
{
- Check.NotNull(ext, "ext"); //NOXLATE
+ Check.ArgumentNotNull(ext, "ext"); //NOXLATE
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.NotNull(ext, "ext"); //NOXLATE
- Check.NotNull(values, "values"); //NOXLATE
+ Check.ArgumentNotNull(ext, "ext"); //NOXLATE
+ Check.ArgumentNotNull(values, "values"); //NOXLATE
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.NotNull(ext, "ext"); //NOXLATE
- Check.NotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotNull(ext, "ext"); //NOXLATE
+ Check.ArgumentNotEmpty(name, "name"); //NOXLATE
if (ext.Extension.Content != null)
{
@@ -885,8 +885,8 @@
/// <returns></returns>
public static string GetValue(this IExtensibleElement ext, string name)
{
- Check.NotNull(ext, "ext"); //NOXLATE
- Check.NotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotNull(ext, "ext"); //NOXLATE
+ Check.ArgumentNotEmpty(name, "name"); //NOXLATE
if (ext.Extension.Content != null)
{
@@ -907,7 +907,7 @@
/// <returns></returns>
public static XmlElement FindElementByName(this XmlElement[] elements, string name)
{
- Check.NotNull(elements, "elements"); //NOXLATE
+ Check.ArgumentNotNull(elements, "elements"); //NOXLATE
foreach (var el in elements)
{
if (el.Name == name)
@@ -923,7 +923,7 @@
/// <returns></returns>
public static string GetMapDefinition(this IMap map)
{
- Check.NotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
return map.GetValue("ResourceId"); //NOXLATE
}
@@ -934,7 +934,7 @@
/// <param name="mapDefId"></param>
public static void SetMapDefinition(this IMap map, string mapDefId)
{
- Check.NotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
map.SetValue("ResourceId", mapDefId); //NOXLATE
}
@@ -945,7 +945,7 @@
/// <returns></returns>
public static IWidgetSet GetFirstWidgetSet(this IApplicationDefinition appDef)
{
- Check.NotNull(appDef, "appDef"); //NOXLATE
+ Check.ArgumentNotNull(appDef, "appDef"); //NOXLATE
IWidgetSet set = null;
foreach (var wgt in appDef.WidgetSets)
{
@@ -995,8 +995,8 @@
{
public RangedWidgetValue(string name, bool required, IComparable minValue, IComparable maxValue) : base(name, required)
{
- Check.NotNull(minValue, "minValue"); //NOXLATE
- Check.NotNull(maxValue, "maxValue"); //NOXLATE
+ Check.ArgumentNotNull(minValue, "minValue"); //NOXLATE
+ Check.ArgumentNotNull(maxValue, "maxValue"); //NOXLATE
if (minValue.CompareTo(maxValue) <= 0)
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Check.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Check.cs 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Check.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -33,17 +33,6 @@
public static class Check
{
/// <summary>
- /// Check that condition evaluates to true
- /// </summary>
- /// <param name="condition"></param>
- /// <param name="msg"></param>
- public static void That(bool condition, string msg)
- {
- if (!condition)
- throw new ArgumentException(msg);
- }
-
- /// <summary>
/// Check that the argument value is not null
/// </summary>
/// <typeparam name="T"></typeparam>
@@ -56,23 +45,11 @@
}
/// <summary>
- /// Check that value is not null
- /// </summary>
- /// <typeparam name="T"></typeparam>
- /// <param name="obj"></param>
- /// <param name="arg"></param>
- public static void NotNull<T>(T obj, string arg) where T : class
- {
- if (obj == null)
- throw new ArgumentException(Strings.PrecondValueNull + arg);
- }
-
- /// <summary>
/// Check that string value is not null or empty
/// </summary>
/// <param name="value"></param>
/// <param name="arg"></param>
- public static void NotEmpty(string value, string arg)
+ public static void ArgumentNotEmpty(string value, string arg)
{
if (string.IsNullOrEmpty(value))
throw new ArgumentException(Strings.PrecondStringEmpty + arg);
@@ -83,7 +60,7 @@
/// </summary>
/// <param name="condition"></param>
/// <param name="msg"></param>
- public static void Precondition(bool condition, string msg)
+ public static void ThatPreconditionIsMet(bool condition, string msg)
{
if (!condition)
throw new ArgumentException(Strings.PrecondFailure + msg);
@@ -97,13 +74,13 @@
/// <param name="max">The upper bound</param>
/// <param name="bInclusive">Determines whether the range is inclusive. If false, the range is exclusive</param>
/// <param name="msg">The message to include for precondition failure</param>
- public static void IntBetween(int value, int min, int max, bool bInclusive, string msg)
+ public static void ThatArgumentIsBetweenRange<T>(T value, T min, T max, bool bInclusive, string msg) where T : IComparable
{
bool bInRange = false;
if (bInclusive)
- bInRange = (value >= min && value <= max);
+ bInRange = (value.CompareTo(min) >= 0 && value.CompareTo(max) <= 0);
else
- bInRange = (value > min && value < max);
+ bInRange = (value.CompareTo(min) > 0 && value.CompareTo(max) < 0);
if (!bInRange)
throw new ArgumentException(Strings.PrecondFailure + msg);
@@ -114,7 +91,7 @@
/// </summary>
/// <param name="folderid">The folder resource id to check</param>
/// <param name="name">The argument name</param>
- public static void IsFolderArgument(string folderid, string name)
+ public static void ThatArgumentIsFolder(string folderid, string name)
{
if (!ResourceIdentifier.IsFolderResource(folderid))
throw new ArgumentException(string.Format(Strings.NotAFolder, folderid), name);
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IEnvelope.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IEnvelope.cs 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IEnvelope.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -70,7 +70,7 @@
/// <returns></returns>
public static IPoint2D Center(this IEnvelope env)
{
- Check.NotNull(env, "env"); //NOXLATE
+ Check.ArgumentNotNull(env, "env"); //NOXLATE
return ObjectFactory.CreatePoint2D(
(env.MinX + env.MaxX) / 2,
@@ -84,7 +84,7 @@
/// <returns></returns>
public static IEnvelope Clone(this IEnvelope env)
{
- Check.NotNull(env, "env"); //NOXLATE
+ Check.ArgumentNotNull(env, "env"); //NOXLATE
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.NotNull(env, "env"); //NOXLATE
+ Check.ArgumentNotNull(env, "env"); //NOXLATE
if (e1 == null)
return;
@@ -123,7 +123,7 @@
/// </returns>
public static bool Contains(this IEnvelope env, double x, double y)
{
- Check.NotNull(env, "env"); //NOXLATE
+ Check.ArgumentNotNull(env, "env"); //NOXLATE
return env.MinX <= x &&
env.MaxX >= x &&
@@ -139,7 +139,7 @@
/// <returns></returns>
public static bool Intersects(this IEnvelope env, IEnvelope other)
{
- Check.NotNull(env, "env"); //NOXLATE
+ Check.ArgumentNotNull(env, "env"); //NOXLATE
if (other == null)
return false;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/FeatureSourceInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/FeatureSourceInterfaces.cs 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/FeatureSourceInterfaces.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -363,7 +363,7 @@
/// <returns></returns>
public static NameValueCollection GetConnectionProperties(this IFeatureSource fs)
{
- Check.NotNull(fs, "fs"); //NOXLATE
+ Check.ArgumentNotNull(fs, "fs"); //NOXLATE
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.NotNull(fs, "fs"); //NOXLATE
- Check.NotNull(values, "values"); //NOXLATE
+ Check.ArgumentNotNull(fs, "fs"); //NOXLATE
+ Check.ArgumentNotNull(values, "values"); //NOXLATE
fs.ClearConnectionProperties();
@@ -400,7 +400,7 @@
/// <param name="coordSys"></param>
public static void AddSpatialContextOverride(this IFeatureSource fs, string name, string coordSys)
{
- Check.NotNull(fs, "fs"); //NOXLATE
+ Check.ArgumentNotNull(fs, "fs"); //NOXLATE
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.NotNull(rel, "rel"); //NOXLATE
+ Check.ArgumentNotNull(rel, "rel"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/LayerDefinitionInterfaces.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -202,7 +202,7 @@
/// <returns></returns>
public static IList<IStroke> CloneStrokes(IEnumerable<IStroke> strokes)
{
- Check.NotNull(strokes, "strokes"); //NOXLATE
+ Check.ArgumentNotNull(strokes, "strokes"); //NOXLATE
var list = new List<IStroke>();
foreach (var st in strokes)
{
@@ -2172,7 +2172,7 @@
/// <param name="c">The c.</param>
public static void SetBlockColor(this IBlockSymbol sym, Color c)
{
- Check.NotNull(sym, "sym");
+ Check.ArgumentNotNull(sym, "sym");
sym.BlockColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2183,7 +2183,7 @@
/// <param name="c">The c.</param>
public static void SetLayerColor(this IBlockSymbol sym, Color c)
{
- Check.NotNull(sym, "sym"); //NOXLATE
+ Check.ArgumentNotNull(sym, "sym"); //NOXLATE
sym.LayerColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2194,7 +2194,7 @@
/// <param name="f"></param>
public static void Apply(this IFontSymbol sym, Font f)
{
- Check.NotNull(sym, "sym"); //NOXLATE
+ Check.ArgumentNotNull(sym, "sym"); //NOXLATE
sym.FontName = f.Name;
sym.Italic = f.Italic;
sym.Bold = f.Bold;
@@ -2208,7 +2208,7 @@
/// <param name="c">The c.</param>
public static void SetForegroundColor(this IFontSymbol sym, Color c)
{
- Check.NotNull(sym, "sym"); //NOXLATE
+ Check.ArgumentNotNull(sym, "sym"); //NOXLATE
sym.ForegroundColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2221,7 +2221,7 @@
/// </returns>
public static bool HasVectorScaleRanges(this IVectorLayerDefinition vl)
{
- Check.NotNull(vl, "vl"); //NOXLATE
+ Check.ArgumentNotNull(vl, "vl"); //NOXLATE
return vl.GetScaleRangeCount() > 0;
}
@@ -2232,7 +2232,7 @@
/// <returns></returns>
public static int GetScaleRangeCount(this IVectorLayerDefinition vl)
{
- Check.NotNull(vl, "vl"); //NOXLATE
+ Check.ArgumentNotNull(vl, "vl"); //NOXLATE
var list = new List<IVectorScaleRange>(vl.VectorScaleRange);
return list.Count;
}
@@ -2244,8 +2244,8 @@
/// <param name="geomTypes">The geometry types to remove</param>
public static void RemoveStyles(this IVectorScaleRange range, IEnumerable<string> geomTypes)
{
- Check.NotNull(range, "range"); //NOXLATE
- Check.NotNull(geomTypes, "geomTypes"); //NOXLATE
+ Check.ArgumentNotNull(range, "range"); //NOXLATE
+ Check.ArgumentNotNull(geomTypes, "geomTypes"); //NOXLATE
List<IVectorStyle> remove = new List<IVectorStyle>();
@@ -2306,7 +2306,7 @@
/// <param name="c">The c.</param>
public static void SetFillColor(this IW2DSymbol sym, Color c)
{
- Check.NotNull(sym, "sym"); //NOXLATE
+ Check.ArgumentNotNull(sym, "sym"); //NOXLATE
sym.FillColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2317,7 +2317,7 @@
/// <param name="c">The c.</param>
public static void SetLineColor(this IW2DSymbol sym, Color c)
{
- Check.NotNull(sym, "sym"); //NOXLATE
+ Check.ArgumentNotNull(sym, "sym"); //NOXLATE
sym.LineColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2328,7 +2328,7 @@
/// <param name="c">The c.</param>
public static void SetTextColor(this IW2DSymbol sym, Color c)
{
- Check.NotNull(sym, "sym"); //NOXLATE
+ Check.ArgumentNotNull(sym, "sym"); //NOXLATE
sym.TextColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2339,7 +2339,7 @@
/// <param name="c">The c.</param>
public static void SetForegroundColor(this ITextSymbol sym, Color c)
{
- Check.NotNull(sym, "sym"); //NOXLATE
+ Check.ArgumentNotNull(sym, "sym"); //NOXLATE
sym.ForegroundColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2350,7 +2350,7 @@
/// <param name="c">The c.</param>
public static void SetBackgroundColor(this ITextSymbol sym, Color c)
{
- Check.NotNull(sym, "sym"); //NOXLATE
+ Check.ArgumentNotNull(sym, "sym"); //NOXLATE
sym.BackgroundColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2361,7 +2361,7 @@
/// <param name="f"></param>
public static void Apply(this ITextSymbol sym, Font f)
{
- Check.NotNull(sym, "sym"); //NOXLATE
+ Check.ArgumentNotNull(sym, "sym"); //NOXLATE
sym.FontName = f.Name;
sym.Italic = f.Italic.ToString();
sym.Bold = f.Bold.ToString();
@@ -2375,7 +2375,7 @@
/// <param name="c">The c.</param>
public static void SetBackgroundColor(this IFill fil, Color c)
{
- Check.NotNull(fil, "fil"); //NOXLATE
+ Check.ArgumentNotNull(fil, "fil"); //NOXLATE
fil.BackgroundColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2386,7 +2386,7 @@
/// <param name="c">The c.</param>
public static void SetForegroundColor(this IFill fil, Color c)
{
- Check.NotNull(fil, "fil"); //NOXLATE
+ Check.ArgumentNotNull(fil, "fil"); //NOXLATE
fil.ForegroundColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2397,7 +2397,7 @@
/// <param name="c">The c.</param>
public static void SetTransparencyColor(this IGridColorStyle style, Color c)
{
- Check.NotNull(style, "style"); //NOXLATE
+ Check.ArgumentNotNull(style, "style"); //NOXLATE
style.TransparencyColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2408,7 +2408,7 @@
/// <param name="c">The c.</param>
public static void SetDefaultColor(this IGridSurfaceStyle style, Color c)
{
- Check.NotNull(style, "style"); //NOXLATE
+ Check.ArgumentNotNull(style, "style"); //NOXLATE
style.DefaultColor = Utils.SerializeHTMLColor(c, true);
}
@@ -2418,7 +2418,7 @@
/// <param name="style"></param>
public static void RemoveAllRules(this ICompositeTypeStyle style)
{
- Check.NotNull(style, "style"); //NOXLATE
+ Check.ArgumentNotNull(style, "style"); //NOXLATE
var remove = new List<ICompositeRule>();
foreach (var r in style.CompositeRule)
@@ -2442,7 +2442,7 @@
/// <returns>The defined parameter</returns>
public static IParameter DefineParameter(this ISimpleSymbolDefinition simpleSym, string identifier, string defaultValue, string displayName, string description, string dataType)
{
- Check.NotNull(simpleSym, "simpleSym");
+ Check.ArgumentNotNull(simpleSym, "simpleSym");
var p = simpleSym.CreateParameter();
p.Identifier = identifier;
p.DefaultValue = defaultValue;
@@ -2463,7 +2463,7 @@
/// <returns>The added parameter override</returns>
public static IParameterOverride AddOverride(this IParameterOverrideCollection overrides, string symbolName, string paramName, string paramValue)
{
- Check.NotNull(overrides, "overrides");
+ Check.ArgumentNotNull(overrides, "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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0/VectorLayerDefinitionImpl.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -952,7 +952,7 @@
void ILineRule.SetStrokes(IEnumerable<IStroke> strokes)
{
- Check.NotNull(strokes, "strokes"); //NOXLATE
+ Check.ArgumentNotNull(strokes, "strokes"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0/VectorLayerDefinitionImpl.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -952,7 +952,7 @@
void ILineRule.SetStrokes(IEnumerable<IStroke> strokes)
{
- Check.NotNull(strokes, "strokes"); //NOXLATE
+ Check.ArgumentNotNull(strokes, "strokes"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0/VectorLayerDefinitionImpl.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -952,7 +952,7 @@
void ILineRule.SetStrokes(IEnumerable<IStroke> strokes)
{
- Check.NotNull(strokes, "strokes"); //NOXLATE
+ Check.ArgumentNotNull(strokes, "strokes"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0/VectorLayerDefinitionImpl.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -953,7 +953,7 @@
void ILineRule.SetStrokes(IEnumerable<IStroke> strokes)
{
- Check.NotNull(strokes, "strokes"); //NOXLATE
+ Check.ArgumentNotNull(strokes, "strokes"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0/VectorLayerDefinitionImpl.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -955,7 +955,7 @@
void ILineRule.SetStrokes(IEnumerable<IStroke> strokes)
{
- Check.NotNull(strokes, "strokes"); //NOXLATE
+ Check.ArgumentNotNull(strokes, "strokes"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0/VectorLayerDefinitionImpl.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -955,7 +955,7 @@
void ILineRule.SetStrokes(IEnumerable<IStroke> strokes)
{
- Check.NotNull(strokes, "strokes"); //NOXLATE
+ Check.ArgumentNotNull(strokes, "strokes"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/LoadProcedureInterfaces.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -261,8 +261,8 @@
/// <param name="files"></param>
public static void AddFiles(this IBaseLoadProcedure proc, IEnumerable<string> files)
{
- Check.NotNull(proc, "proc"); //NOXLATE
- Check.NotNull(files, "files"); //NOXLATE
+ Check.ArgumentNotNull(proc, "proc"); //NOXLATE
+ Check.ArgumentNotNull(files, "files"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_0_0/LoadProcedureImpl.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -132,7 +132,7 @@
public void AddFiles(IEnumerable<string> files)
{
- Check.NotNull(files, "files"); //NOXLATE
+ Check.ArgumentNotNull(files, "files"); //NOXLATE
var _files = this.sourceFileField;
foreach (var f in files)
@@ -144,7 +144,7 @@
public void RemoveFile(string file)
{
- Check.NotEmpty(file, "file"); //NOXLATE
+ Check.ArgumentNotEmpty(file, "file"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0/LoadProcedureImpl.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -133,7 +133,7 @@
public void AddFiles(IEnumerable<string> files)
{
- Check.NotNull(files, "files"); //NOXLATE
+ Check.ArgumentNotNull(files, "files"); //NOXLATE
var _files = this.sourceFileField;
foreach (var f in files)
@@ -145,7 +145,7 @@
public void RemoveFile(string file)
{
- Check.NotEmpty(file, "file"); //NOXLATE
+ Check.ArgumentNotEmpty(file, "file"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v2_4_0/LoadProcedureImpl.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -133,7 +133,7 @@
public void AddFiles(IEnumerable<string> files)
{
- Check.NotNull(files, "files"); //NOXLATE
+ Check.ArgumentNotNull(files, "files"); //NOXLATE
var _files = this.sourceFileField;
foreach (var f in files)
@@ -145,7 +145,7 @@
public void RemoveFile(string file)
{
- Check.NotEmpty(file, "file"); //NOXLATE
+ Check.ArgumentNotEmpty(file, "file"); //NOXLATE
if (this.sourceFileField.Contains(file))
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/MapDefinitionInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/MapDefinitionInterfaces.cs 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/MapDefinitionInterfaces.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -292,7 +292,7 @@
/// <returns></returns>
public static double GetMinScale(this IBaseMapDefinition map)
{
- Check.NotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
if (map.ScaleCount == 0)
return 0.0;
@@ -308,7 +308,7 @@
/// <returns></returns>
public static double GetMaxScale(this IBaseMapDefinition map)
{
- Check.NotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
if (map.ScaleCount == 0)
return 0.0;
@@ -325,7 +325,7 @@
/// <returns></returns>
public static IBaseMapGroup GetGroupForLayer(this IBaseMapDefinition map, IBaseMapLayer layer)
{
- Check.NotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
foreach (var group in map.BaseMapLayerGroup)
{
foreach (var tl in group.BaseMapLayer)
@@ -344,7 +344,7 @@
/// <returns></returns>
public static bool HasLayers(this IBaseMapGroup grp)
{
- Check.NotNull(grp, "grp"); //NOXLATE
+ Check.ArgumentNotNull(grp, "grp"); //NOXLATE
return new List<IBaseMapLayer>(grp.BaseMapLayer).Count > 0;
}
@@ -355,7 +355,7 @@
/// <returns></returns>
public static bool HasLayers(this IBaseMapDefinition map)
{
- Check.NotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
if (!map.HasGroups())
return false;
@@ -374,7 +374,7 @@
/// <returns></returns>
public static bool HasGroups(this IBaseMapDefinition map)
{
- Check.NotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
return new List<IBaseMapGroup>(map.BaseMapLayerGroup).Count > 0;
}
@@ -385,7 +385,7 @@
/// <returns></returns>
public static IBaseMapGroup GetFirstGroup(this IBaseMapDefinition map)
{
- Check.NotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
var list = new List<IBaseMapGroup>(map.BaseMapLayerGroup);
if (list.Count > 0)
return list[0];
@@ -400,8 +400,8 @@
/// <returns></returns>
public static bool LayerExists(this IBaseMapDefinition map, string layerName)
{
- Check.NotNull(map, "map"); //NOXLATE
- Check.NotEmpty(layerName, "layerName"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotEmpty(layerName, "layerName"); //NOXLATE
foreach (var group in map.BaseMapLayerGroup)
{
@@ -422,8 +422,8 @@
/// <returns></returns>
public static IBaseMapGroup GetGroup(this IBaseMapDefinition map, string groupName)
{
- Check.NotNull(map, "map"); //NOXLATE
- Check.NotEmpty(groupName, "groupName"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotEmpty(groupName, "groupName"); //NOXLATE
foreach (var group in map.BaseMapLayerGroup)
{
if (groupName.Equals(group.Name))
@@ -440,8 +440,8 @@
/// <returns></returns>
public static bool GroupExists(this IBaseMapDefinition map, string groupName)
{
- Check.NotNull(map, "map"); //NOXLATE
- Check.NotEmpty(groupName, "groupName"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotEmpty(groupName, "groupName"); //NOXLATE
foreach (var group in map.BaseMapLayerGroup)
{
if (groupName.Equals(group.Name))
@@ -458,8 +458,8 @@
/// <returns></returns>
public static IEnumerable<IBaseMapLayer> GetLayersForGroup(this IBaseMapDefinition map, string groupName)
{
- Check.NotNull(map, "map"); //NOXLATE
- Check.NotEmpty(groupName, "groupName"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotEmpty(groupName, "groupName"); //NOXLATE
foreach (var group in map.BaseMapLayerGroup)
{
@@ -485,7 +485,7 @@
/// <param name="scale"></param>
public static void AddFiniteDisplayScale(this IMapDefinition map, double scale)
{
- Check.NotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
if (map.BaseMap != null)
map.InitBaseMap();
@@ -501,7 +501,7 @@
/// <param name="bDetachIfEmpty"></param>
public static void RemoveFiniteDisplayScale(this IMapDefinition map, double scale, bool bDetachIfEmpty)
{
- Check.NotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
if (map.BaseMap == null)
return;
@@ -518,7 +518,7 @@
/// <param name="bDetachIfEmpty"></param>
public static void RemoveAllFiniteDisplayScales(this IMapDefinition map, bool bDetachIfEmpty)
{
- Check.NotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
if (map.BaseMap == null)
return;
@@ -536,8 +536,8 @@
/// <returns></returns>
public static IBaseMapGroup AddBaseLayerGroup(this IMapDefinition map, string name)
{
- Check.NotNull(map, "map"); //NOXLATE
- Check.NotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotEmpty(name, "name"); //NOXLATE
if (map.BaseMap == null)
map.InitBaseMap();
@@ -553,7 +553,7 @@
/// <param name="bDetachIfEmpty"></param>
public static void RemoveBaseLayerGroup(this IMapDefinition map, IBaseMapGroup group, bool bDetachIfEmpty)
{
- Check.NotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
if (null == group)
return;
@@ -573,9 +573,9 @@
/// <param name="newGroupName">New name of the group.</param>
public static void UpdateDynamicGroupName(this IMapDefinition map, string oldGroupName, string newGroupName)
{
- Check.NotNull(map, "map"); //NOXLATE
- Check.NotEmpty(oldGroupName, "oldGroupName"); //NOXLATE
- Check.NotEmpty(newGroupName, "newGroupName"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotEmpty(oldGroupName, "oldGroupName"); //NOXLATE
+ Check.ArgumentNotEmpty(newGroupName, "newGroupName"); //NOXLATE
var layers = map.GetLayersForGroup(oldGroupName);
var groups = map.GetGroupsForGroup(oldGroupName);
foreach (var l in layers)
@@ -596,8 +596,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.NotNull(map, "map"); //NOXLATE
- Check.NotEmpty(groupName, "groupName"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotEmpty(groupName, "groupName"); //NOXLATE
var affectedParentGroups = new Dictionary<string, List<IMapLayerGroup>>();
IMapLayerGroup group = null;
@@ -652,8 +652,8 @@
/// <returns></returns>
public static IMapLayer GetLayerByName(this IMapDefinition map, string name)
{
- Check.NotNull(map, "map"); //NOXLATE
- Check.NotEmpty(name, "name"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotEmpty(name, "name"); //NOXLATE
foreach (var layer in map.MapLayer)
{
if (name.Equals(layer.Name))
@@ -670,7 +670,7 @@
/// <returns></returns>
public static IMapLayerGroup GetGroupByName(this IMapDefinition map, string name)
{
- Check.NotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
foreach (var group in map.MapLayerGroup)
{
if (name.Equals(group.Name))
@@ -686,7 +686,7 @@
/// <returns></returns>
public static int GetLayerCount(this IMapDefinition map)
{
- Check.NotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
return new List<IMapLayer>(map.MapLayer).Count;
}
@@ -697,7 +697,7 @@
/// <returns></returns>
public static int GetGroupCount(this IMapDefinition map)
{
- Check.NotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
return new List<IMapLayerGroup>(map.MapLayerGroup).Count;
}
@@ -709,7 +709,7 @@
/// <returns></returns>
public static IEnumerable<IMapLayer> GetLayersForGroup(this IMapDefinition map, string name)
{
- Check.NotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
foreach (var layer in map.MapLayer)
{
if (name.Equals(layer.Group))
@@ -725,7 +725,7 @@
/// <returns></returns>
public static IEnumerable<IMapLayerGroup> GetGroupsForGroup(this IMapDefinition map, string name)
{
- Check.NotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
foreach (var group in map.MapLayerGroup)
{
if (name.Equals(group.Group))
@@ -740,7 +740,7 @@
/// <returns></returns>
public static IEnumerable<IMapLayer> GetLayersWithoutGroups(this IMapDefinition map)
{
- Check.NotNull(map, "map"); //NOXLATE
+ Check.ArgumentNotNull(map, "map"); //NOXLATE
foreach (var layer in map.MapLayer)
{
if (string.IsNullOrEmpty(layer.Group))
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v1_0_0/MapDefinitionImpl.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -218,8 +218,8 @@
/// <param name="layer"></param>
void IMapDefinition.InsertLayer(int idx, IMapLayer layer)
{
- Check.IntBetween(idx, 0, this.MapLayer.Count, true, "idx (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]"); //NOXLATE
- Check.NotNull(layer, "layer"); //NOXLATE
+ Check.ThatArgumentIsBetweenRange(idx, 0, this.MapLayer.Count, true, "idx (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]"); //NOXLATE
+ Check.ArgumentNotNull(layer, "layer"); //NOXLATE
var li = layer as MapLayerType;
if (li != null)
{
@@ -253,8 +253,8 @@
public IMapLayerGroup AddGroup(string groupName)
{
- Check.NotEmpty(groupName, "groupName"); //NOXLATE
- Check.Precondition(this.GetGroupByName(groupName) == null, "<groupName> does not already exist"); //NOXLATE
+ Check.ArgumentNotEmpty(groupName, "groupName"); //NOXLATE
+ Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) == null, "<groupName> does not already exist"); //NOXLATE
if (this.MapLayerGroup == null)
this.MapLayerGroup = new System.ComponentModel.BindingList<MapLayerGroupType>();
@@ -275,13 +275,13 @@
public IMapLayer AddLayer(string groupName, string layerName, string layerDefinitionId)
{
- Check.NotEmpty(layerName, "layerName"); //NOXLATE
- Check.NotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
- Check.Precondition(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
- Check.Precondition(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), "ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ 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
if (!string.IsNullOrEmpty(groupName))
{
- Check.Precondition(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()
{
@@ -339,14 +339,14 @@
public IMapLayer InsertLayer(int index, string groupName, string layerName, string layerDefinitionId)
{
- Check.IntBetween(index, 0, this.MapLayer.Count, true, "index (" + index + ") between [" + 0 + "," + this.MapLayer.Count + "]");
- Check.NotEmpty(layerName, "layerName"); //NOXLATE
- Check.NotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
- Check.Precondition(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
- Check.Precondition(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), "ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ 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
if (!string.IsNullOrEmpty(groupName))
{
- Check.NotNull(this.GetGroupByName(groupName), "Group for <groupName>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), "Group for <groupName>"); //NOXLATE
}
var layer = new MapLayerType()
{
@@ -366,13 +366,13 @@
public IMapLayer AddLayer(IMapLayer layerToInsertAbove, string groupName, string layerName, string layerDefinitionId)
{
- Check.NotEmpty(layerName, "layerName"); //NOXLATE
- Check.NotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
- Check.Precondition(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
- Check.Precondition(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), "ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ 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
if (!string.IsNullOrEmpty(groupName))
{
- Check.NotNull(this.GetGroupByName(groupName), "Group for <groupName>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), "Group for <groupName>"); //NOXLATE
}
var layer = new MapLayerType()
{
@@ -519,7 +519,7 @@
void IMapDefinition.RemoveGroup(IMapLayerGroup group)
{
- Check.NotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, "group"); //NOXLATE
var grp = group as MapLayerGroupType;
if (grp != null)
{
@@ -540,7 +540,7 @@
int IMapDefinition.GetIndex(IMapLayer layer)
{
- Check.NotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, "layer"); //NOXLATE
var lyr = layer as MapLayerType;
if (lyr != null)
return this.MapLayer.IndexOf(lyr);
@@ -550,7 +550,7 @@
int IMapDefinition.MoveUp(IMapLayer layer)
{
- Check.NotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, "layer"); //NOXLATE
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc > 0)
{
@@ -576,7 +576,7 @@
int IMapDefinition.MoveDown(IMapLayer layer)
{
- Check.NotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, "layer"); //NOXLATE
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc < this.MapLayer.Count - 1)
{
@@ -602,7 +602,7 @@
int IMapDefinition.MoveUpGroup(IMapLayerGroup group)
{
- Check.NotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, "group"); //NOXLATE
var grp = group as MapLayerGroupType;
if (grp != null)
{
@@ -632,7 +632,7 @@
int IMapDefinition.MoveDownGroup(IMapLayerGroup group)
{
- Check.NotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, "group"); //NOXLATE
var grp = group as MapLayerGroupType;
if (grp != null)
{
@@ -662,7 +662,7 @@
int IMapDefinition.GetIndex(IMapLayerGroup group)
{
- Check.NotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, "group"); //NOXLATE
var grp = group as MapLayerGroupType;
if (grp != null)
return this.MapLayerGroup.IndexOf(grp);
@@ -672,7 +672,7 @@
void IMapDefinition.SetTopDrawOrder(IMapLayer layer)
{
- Check.NotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, "layer"); //NOXLATE
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc > 0)
{
@@ -691,7 +691,7 @@
void IMapDefinition.SetBottomDrawOrder(IMapLayer layer)
{
- Check.NotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, "layer"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_3_0/MapDefinitionImpl.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -219,8 +219,8 @@
/// <param name="layer"></param>
void IMapDefinition.InsertLayer(int idx, IMapLayer layer)
{
- Check.IntBetween(idx, 0, this.MapLayer.Count, true, "idx (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]"); //NOXLATE
- Check.NotNull(layer, "layer"); //NOXLATE
+ Check.ThatArgumentIsBetweenRange(idx, 0, this.MapLayer.Count, true, "idx (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]"); //NOXLATE
+ Check.ArgumentNotNull(layer, "layer"); //NOXLATE
var li = layer as MapLayerType;
if (li != null)
{
@@ -254,8 +254,8 @@
public IMapLayerGroup AddGroup(string groupName)
{
- Check.NotEmpty(groupName, "groupName"); //NOXLATE
- Check.Precondition(this.GetGroupByName(groupName) == null, "<groupName> does not already exist"); //NOXLATE
+ Check.ArgumentNotEmpty(groupName, "groupName"); //NOXLATE
+ Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) == null, "<groupName> does not already exist"); //NOXLATE
if (this.MapLayerGroup == null)
this.MapLayerGroup = new System.ComponentModel.BindingList<MapLayerGroupType>();
@@ -276,13 +276,13 @@
public IMapLayer AddLayer(string groupName, string layerName, string layerDefinitionId)
{
- Check.NotEmpty(layerName, "layerName"); //NOXLATE
- Check.NotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
- Check.Precondition(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
- Check.Precondition(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), "ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ 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
if (!string.IsNullOrEmpty(groupName))
{
- Check.Precondition(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()
{
@@ -340,14 +340,14 @@
public IMapLayer InsertLayer(int index, string groupName, string layerName, string layerDefinitionId)
{
- Check.IntBetween(index, 0, this.MapLayer.Count, true, "index (" + index + ") between [" + 0 + "," + this.MapLayer.Count + "]");
- Check.NotEmpty(layerName, "layerName"); //NOXLATE
- Check.NotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
- Check.Precondition(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
- Check.Precondition(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), "ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ 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
if (!string.IsNullOrEmpty(groupName))
{
- Check.NotNull(this.GetGroupByName(groupName), "Group for <groupName>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), "Group for <groupName>"); //NOXLATE
}
var layer = new MapLayerType()
{
@@ -367,13 +367,13 @@
public IMapLayer AddLayer(IMapLayer layerToInsertAbove, string groupName, string layerName, string layerDefinitionId)
{
- Check.NotEmpty(layerName, "layerName"); //NOXLATE
- Check.NotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
- Check.Precondition(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
- Check.Precondition(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), "ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ 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
if (!string.IsNullOrEmpty(groupName))
{
- Check.NotNull(this.GetGroupByName(groupName), "Group for <groupName>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), "Group for <groupName>"); //NOXLATE
}
var layer = new MapLayerType()
{
@@ -520,7 +520,7 @@
void IMapDefinition.RemoveGroup(IMapLayerGroup group)
{
- Check.NotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, "group"); //NOXLATE
var grp = group as MapLayerGroupType;
if (grp != null)
{
@@ -541,7 +541,7 @@
int IMapDefinition.GetIndex(IMapLayer layer)
{
- Check.NotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, "layer"); //NOXLATE
var lyr = layer as MapLayerType;
if (lyr != null)
return this.MapLayer.IndexOf(lyr);
@@ -551,7 +551,7 @@
int IMapDefinition.MoveUp(IMapLayer layer)
{
- Check.NotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, "layer"); //NOXLATE
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc > 0)
{
@@ -577,7 +577,7 @@
int IMapDefinition.MoveDown(IMapLayer layer)
{
- Check.NotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, "layer"); //NOXLATE
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc < this.MapLayer.Count - 1)
{
@@ -603,7 +603,7 @@
int IMapDefinition.MoveUpGroup(IMapLayerGroup group)
{
- Check.NotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, "group"); //NOXLATE
var grp = group as MapLayerGroupType;
if (grp != null)
{
@@ -633,7 +633,7 @@
int IMapDefinition.MoveDownGroup(IMapLayerGroup group)
{
- Check.NotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, "group"); //NOXLATE
var grp = group as MapLayerGroupType;
if (grp != null)
{
@@ -663,7 +663,7 @@
int IMapDefinition.GetIndex(IMapLayerGroup group)
{
- Check.NotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, "group"); //NOXLATE
var grp = group as MapLayerGroupType;
if (grp != null)
return this.MapLayerGroup.IndexOf(grp);
@@ -673,7 +673,7 @@
void IMapDefinition.SetTopDrawOrder(IMapLayer layer)
{
- Check.NotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, "layer"); //NOXLATE
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc > 0)
{
@@ -692,7 +692,7 @@
void IMapDefinition.SetBottomDrawOrder(IMapLayer layer)
{
- Check.NotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, "layer"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_4_0/MapDefinitionImpl.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -220,8 +220,8 @@
/// <param name="layer"></param>
void IMapDefinition.InsertLayer(int idx, IMapLayer layer)
{
- Check.IntBetween(idx, 0, this.MapLayer.Count, true, "idx (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]"); //NOXLATE
- Check.NotNull(layer, "layer"); //NOXLATE
+ Check.ThatArgumentIsBetweenRange(idx, 0, this.MapLayer.Count, true, "idx (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]"); //NOXLATE
+ Check.ArgumentNotNull(layer, "layer"); //NOXLATE
var li = layer as MapLayerType;
if (li != null)
{
@@ -255,8 +255,8 @@
public IMapLayerGroup AddGroup(string groupName)
{
- Check.NotEmpty(groupName, "groupName"); //NOXLATE
- Check.Precondition(this.GetGroupByName(groupName) == null, "<groupName> does not already exist"); //NOXLATE
+ Check.ArgumentNotEmpty(groupName, "groupName"); //NOXLATE
+ Check.ThatPreconditionIsMet(this.GetGroupByName(groupName) == null, "<groupName> does not already exist"); //NOXLATE
if (this.MapLayerGroup == null)
this.MapLayerGroup = new System.ComponentModel.BindingList<MapLayerGroupType>();
@@ -277,13 +277,13 @@
public IMapLayer AddLayer(string groupName, string layerName, string layerDefinitionId)
{
- Check.NotEmpty(layerName, "layerName"); //NOXLATE
- Check.NotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
- Check.Precondition(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
- Check.Precondition(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), "ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ 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
if (!string.IsNullOrEmpty(groupName))
{
- Check.Precondition(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()
{
@@ -341,14 +341,14 @@
public IMapLayer InsertLayer(int index, string groupName, string layerName, string layerDefinitionId)
{
- Check.IntBetween(index, 0, this.MapLayer.Count, true, "index (" + index + ") between [" + 0 + "," + this.MapLayer.Count + "]");
- Check.NotEmpty(layerName, "layerName"); //NOXLATE
- Check.NotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
- Check.Precondition(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
- Check.Precondition(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), "ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ 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
if (!string.IsNullOrEmpty(groupName))
{
- Check.NotNull(this.GetGroupByName(groupName), "Group for <groupName>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), "Group for <groupName>"); //NOXLATE
}
var layer = new MapLayerType()
{
@@ -368,13 +368,13 @@
public IMapLayer AddLayer(IMapLayer layerToInsertAbove, string groupName, string layerName, string layerDefinitionId)
{
- Check.NotEmpty(layerName, "layerName"); //NOXLATE
- Check.NotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
- Check.Precondition(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
- Check.Precondition(ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString(), "ResourceIdentifier.GetResourceTypeAsString(layerDefinitionId) == ResourceTypes.LayerDefinition.ToString()"); //NOXLATE
+ 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
if (!string.IsNullOrEmpty(groupName))
{
- Check.NotNull(this.GetGroupByName(groupName), "Group for <groupName>"); //NOXLATE
+ Check.ArgumentNotNull(this.GetGroupByName(groupName), "Group for <groupName>"); //NOXLATE
}
var layer = new MapLayerType()
{
@@ -521,7 +521,7 @@
void IMapDefinition.RemoveGroup(IMapLayerGroup group)
{
- Check.NotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, "group"); //NOXLATE
var grp = group as MapLayerGroupType;
if (grp != null)
{
@@ -542,7 +542,7 @@
int IMapDefinition.GetIndex(IMapLayer layer)
{
- Check.NotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, "layer"); //NOXLATE
var lyr = layer as MapLayerType;
if (lyr != null)
return this.MapLayer.IndexOf(lyr);
@@ -552,7 +552,7 @@
int IMapDefinition.MoveUp(IMapLayer layer)
{
- Check.NotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, "layer"); //NOXLATE
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc > 0)
{
@@ -578,7 +578,7 @@
int IMapDefinition.MoveDown(IMapLayer layer)
{
- Check.NotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, "layer"); //NOXLATE
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc < this.MapLayer.Count - 1)
{
@@ -604,7 +604,7 @@
int IMapDefinition.MoveUpGroup(IMapLayerGroup group)
{
- Check.NotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, "group"); //NOXLATE
var grp = group as MapLayerGroupType;
if (grp != null)
{
@@ -634,7 +634,7 @@
int IMapDefinition.MoveDownGroup(IMapLayerGroup group)
{
- Check.NotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, "group"); //NOXLATE
var grp = group as MapLayerGroupType;
if (grp != null)
{
@@ -664,7 +664,7 @@
int IMapDefinition.GetIndex(IMapLayerGroup group)
{
- Check.NotNull(group, "group"); //NOXLATE
+ Check.ArgumentNotNull(group, "group"); //NOXLATE
var grp = group as MapLayerGroupType;
if (grp != null)
return this.MapLayerGroup.IndexOf(grp);
@@ -674,7 +674,7 @@
void IMapDefinition.SetTopDrawOrder(IMapLayer layer)
{
- Check.NotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, "layer"); //NOXLATE
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc > 0)
{
@@ -693,7 +693,7 @@
void IMapDefinition.SetBottomDrawOrder(IMapLayer layer)
{
- Check.NotNull(layer, "layer"); //NOXLATE
+ Check.ArgumentNotNull(layer, "layer"); //NOXLATE
int isrc = ((IMapDefinition)this).GetIndex(layer);
if (isrc >= 0 && isrc < this.MapLayer.Count)
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypeDescriptor.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypeDescriptor.cs 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypeDescriptor.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -39,8 +39,8 @@
/// <param name="ver">The ver.</param>
public ResourceTypeDescriptor(string resType, string ver)
{
- Check.NotEmpty(resType, "resType"); //NOXLATE
- Check.NotEmpty(ver, "ver"); //NOXLATE
+ Check.ArgumentNotEmpty(resType, "resType"); //NOXLATE
+ Check.ArgumentNotEmpty(ver, "ver"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/SymbolDefinitionInterfaces.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -148,7 +148,7 @@
/// <returns></returns>
public static IParameter GetParameter(this ISymbolDefinitionBase sym, string identifier)
{
- Check.NotNull(sym, "sym");
+ Check.ArgumentNotNull(sym, "sym"); //NOXLATE
return sym.GetParameters().FirstOrDefault(x => x.Identifier == identifier);
}
@@ -159,7 +159,7 @@
/// <returns></returns>
public static IEnumerable<IParameter> GetParameters(this ISymbolDefinitionBase sym)
{
- Check.NotNull(sym, "sym");
+ Check.ArgumentNotNull(sym, "sym"); //NOXLATE
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.NotNull(ssym, "ssym");
+ Check.ArgumentNotNull(ssym, "ssym");
return ssym.ParameterDefinition.Parameter;
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/WatermarkCollectionUtil.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/WatermarkCollectionUtil.cs 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/WatermarkCollectionUtil.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -31,7 +31,7 @@
{
public static IWatermark AddWatermark<T>(IList<T> collection, IWatermarkDefinition watermark) where T : class, IWatermark, new()
{
- Check.NotNull(watermark, "watermark");
+ Check.ArgumentNotNull(watermark, "watermark"); //NOXLATE
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.NotNull(watermark, "watermark");
+ Check.ArgumentNotNull(watermark, "watermark"); //NOXLATE
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 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/WebLayoutInterfaces.cs 2014-12-29 01:41:22 UTC (rev 8478)
@@ -805,8 +805,8 @@
/// <param name="items"></param>
public static void AddItems(this IMenu mnu, params IUIItem[] items)
{
- Check.NotNull(mnu, "mnu"); //NOXLATE
- Check.NotNull(items, "items"); //NOXLATE
+ Check.ArgumentNotNull(mnu, "mnu"); //NOXLATE
+ Check.ArgumentNotNull(items, "items"); //NOXLATE
foreach (var item in items)
{
mnu.AddItem(item);
Modified: trunk/Tools/Maestro/UnitTests.playlist
===================================================================
--- trunk/Tools/Maestro/UnitTests.playlist 2014-12-29 01:18:35 UTC (rev 8477)
+++ trunk/Tools/Maestro/UnitTests.playlist 2014-12-29 01:41:22 UTC (rev 8478)
@@ -1 +1 @@
-<Playlist Version="1.0"><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.GeometricPropertyDefinitionTests.GeometricPropertyDefinitionTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.FeatureSchemaTests.IndexOfTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestWebLayoutConversions" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ValidationTests.TestUniqueIssues" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.SchemaTests.FindPropertyTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.CapabilityTests.TestHttpCapabilities240" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.FeatureSchemaTests.WriteXmlTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.MiscTests.TestParse3dWkt" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.CapabilityTests.TestHttpCapabilities220" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ValidationTests.TestLayerScaleRangeOverlap" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestMapDefinitionConversions" /><Add Test="
OSGeo.MapGuide.MaestroAPI.Tests.ValidationTests.TestLoadProcedureValidation" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ConfigurationDocumentTests.TestOdbcLoad" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.GeometricPropertyDefinitionTests.GeometryTypesToStringTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.FeatureSchemaTests.AddClassTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestWebLayout" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ConfigurationDocumentTests.TestOdbcSaveLoad" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.FeatureReaderTests.TestXmlFeatureJoinValues" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.CapabilityTests.TestHttpCapabilities120" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.FeatureReaderTests.TestXmlAggregateNullValues" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.SchemaTests.GetOrdinalTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.MiscTests.TestArgParser" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.T
ests.FeatureSchemaTests.CloneTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestMapDefinitionNestedGroupDelete" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.SchemaTests.RemovePropertyTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestMapDefinitionLayerRemove" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.SchemaTests.TestCreate" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestMapDefinitionGroupReordering" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ConfigurationDocumentTests.TestWmsSaveLoad" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ConfigurationDocumentTests.TestOdbcLoad2" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.SchemaTests.RemovePropertyAtTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.FeatureSchemaTests.GetClassTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.SchemaTests.ClassDefinitionTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.CapabilityTests.TestHttpCapabilities250" /><Add
Test="OSGeo.MapGuide.MaestroAPI.Tests.CapabilityTests.TestHttpCapabilities200" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.FeatureSchemaTests.RemoveClassTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.DataPropertyDefinitionTests.IsNumericTypeTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.SchemaTests.TestClassNameEncoding" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.CapabilityTests.TestHttpCapabilities110" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestSymbolDefinitionConversions" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.CapabilityTests.TestHttpCapabilities210" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.GeometricPropertyDefinitionTests.GetIndividualGeometricTypesTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ValidationTests.TestValidationResultSet" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ConfigurationDocumentTests.TestWmsLoad" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ConfigurationDocumentTests.TestWmsLoad3" /><
Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.DataPropertyDefinitionTests.DataPropertyDefinitionTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestMapDefinitionGroupRemove" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.CapabilityTests.TestHttpCapabilities260" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.GeometricPropertyDefinitionTests.SpecificGeometryTypesTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ConfigurationDocumentTests.TestMySqlSchema" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.SchemaTests.TestFeatureSchemaRoundtrip" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.CapabilityTests.TestHttpCapabilities100" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestMapDefinitionGroupAdd" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.CapabilityTests.TestHttpCapabilities230" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ConfigurationDocumentTests.TestWmsLoad2" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestLoadProcedureCon
versions" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestLayerDefinitionConversions" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.FeatureSchemaTests.GetItemTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ValidationTests.TestCase1896" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestMapDefinitionLayerAdd" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.SchemaTests.ClearIdentityPropertiesTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.FeatureReaderTests.TestXmlFeatureNullValues" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestMapDefinitionLayerReordering" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.SchemaTests.IndexOfPropertyTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.SchemaTests.CloneTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.MiscTests.TestParseXyzmWkt" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.MiscTests.TestConnectionString" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.Featu
reSchemaTests.FeatureSchemaTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestMapDefinitionLayerInsert" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.RegisterLayerFactoryMethodTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateMapDefinitionTestWithNameAndCoordSys" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateWatermarkTest" /><Add Test="OSGeo.MapGuide.ObjectModel.Tests.FeatureSourceTests.TestFeatureSourceFileParameters" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateSimplePointTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateCalculatedPropertyTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreatePoint3DTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.RegisterCompoundSymbolFactoryMethodTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateSymbolLibraryTest" /><Add
Test="OSGeo.MapGuide.ObjectModel.Tests.ResourceTests.TestResourceTypeDescriptor" /><Add Test="OSGeo.MapGuide.ObjectModel.Tests.ResourceTests.TestValidResourceIdentifiers" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateMetadataTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.RegisterSimpleSymbolFactoryMethodTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.RegisterWatermarkDefinitionFactoryMethodTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateSecurityUserTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateSimpleSymbolTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateAttributeRelationTest" /><Add Test="OSGeo.MapGuide.ObjectModel.Tests.DrawingSourceTests.DrawingSourceDeserializationWithFullContentModel" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateFeatureSourceExtensionTest" /><Add Test="OSGeo.MapGu
ide.ObjectModels.Tests.ObjectFactoryTests.CreateLoadProcedureTest" /><Add Test="OSGeo.MapGuide.ObjectModel.Tests.ResourceTests.TestCloning" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.RegisterWebLayoutFactoryMethodTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateFeatureSourceTest" /><Add Test="OSGeo.MapGuide.ObjectModel.Tests.ApplicationDefinitionTests.ApplicationDefinitionDeserializationWithFullContentModel" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreatePrintLayoutTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateMapDefinitionTestWithNameAndCoordSysAndExtent" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreatePoint2DTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.RegisterResourceTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateSecurityGroupTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.Object
FactoryTests.CreateSimpleLabelTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateFeatureSourceTestWithParameters" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateSimpleSolidLineTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateLoadProcedureTestWithFileNames" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateEnvelopeTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateDefaultLayerTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateCompoundSymbolTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateSimpleSolidFillTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.RegisterResourceSerializerTest" /><Add Test="OSGeo.MapGuide.ObjectModel.Tests.FeatureSourceTests.FeatureSourceDeserializationWithFullContentModel" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.RegisterMap
DefinitionFactoryMethodTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.RegisterLoadProcedureFactoryMethodTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateDrawingSourceTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateMapDefinitionTestWithName" /><Add Test="OSGeo.MapGuide.MaestroAPI.CrossConnection.Tests.ResourceMigratorTests.ResourceMigratorTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.CrossConnection.Tests.ResourceMigratorTests.MoveResourcesWithOverwriteTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.CrossConnection.Tests.ResourceMigratorTests.CopyResourcesWithOverwriteTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.CrossConnection.Tests.ResourceMigratorTests.CopyResourcesWithoutOverwriteTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.CrossConnection.Tests.ResourceMigratorTests.MoveResourcesWithoutOverwriteTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.CrossConnection.Tests.ResourceRebaserTests.RebaseTest"
/><Add Test="OSGeo.MapGuide.MaestroAPI.CrossConnection.Tests.ResourceRebaserTests.ResourceRebaserTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.UnsupportedConnectionTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.GetLayerByNameTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.RemoveLayerAtTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.UpdateMapDefinitionTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.IndexOfLayerTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.RemoveGroupTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.SetViewCenterTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.GetGroupByNameTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.GetGroupsOfGroupTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.GetLayer
sOfGroupTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.RemoveLayerTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.GetLayerByObjectIdTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.InsertLayerTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.ToMapDefinitionTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.GetFiniteDisplayScaleAtTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.SetLayerIndexTest" /></Playlist>
\ No newline at end of file
+<Playlist Version="1.0"><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.GeometricPropertyDefinitionTests.GeometricPropertyDefinitionTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.FeatureSchemaTests.IndexOfTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestWebLayoutConversions" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ValidationTests.TestUniqueIssues" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.SchemaTests.FindPropertyTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.CapabilityTests.TestHttpCapabilities240" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.FeatureSchemaTests.WriteXmlTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.MiscTests.TestParse3dWkt" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.CapabilityTests.TestHttpCapabilities220" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ValidationTests.TestLayerScaleRangeOverlap" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestMapDefinitionConversions" /><Add Test="
OSGeo.MapGuide.MaestroAPI.Tests.ValidationTests.TestLoadProcedureValidation" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ConfigurationDocumentTests.TestOdbcLoad" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.GeometricPropertyDefinitionTests.GeometryTypesToStringTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.FeatureSchemaTests.AddClassTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestWebLayout" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ConfigurationDocumentTests.TestOdbcSaveLoad" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.FeatureReaderTests.TestXmlFeatureJoinValues" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.CapabilityTests.TestHttpCapabilities120" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.FeatureReaderTests.TestXmlAggregateNullValues" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.SchemaTests.GetOrdinalTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.MiscTests.TestArgParser" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.T
ests.FeatureSchemaTests.CloneTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestMapDefinitionNestedGroupDelete" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.SchemaTests.RemovePropertyTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestMapDefinitionLayerRemove" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.SchemaTests.TestCreate" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestMapDefinitionGroupReordering" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ConfigurationDocumentTests.TestWmsSaveLoad" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ConfigurationDocumentTests.TestOdbcLoad2" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.SchemaTests.RemovePropertyAtTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.FeatureSchemaTests.GetClassTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.SchemaTests.ClassDefinitionTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.CapabilityTests.TestHttpCapabilities250" /><Add
Test="OSGeo.MapGuide.MaestroAPI.Tests.CapabilityTests.TestHttpCapabilities200" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.FeatureSchemaTests.RemoveClassTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.DataPropertyDefinitionTests.IsNumericTypeTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.SchemaTests.TestClassNameEncoding" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.CapabilityTests.TestHttpCapabilities110" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestSymbolDefinitionConversions" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.CapabilityTests.TestHttpCapabilities210" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.GeometricPropertyDefinitionTests.GetIndividualGeometricTypesTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ValidationTests.TestValidationResultSet" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ConfigurationDocumentTests.TestWmsLoad" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ConfigurationDocumentTests.TestWmsLoad3" /><
Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.DataPropertyDefinitionTests.DataPropertyDefinitionTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestMapDefinitionGroupRemove" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.CapabilityTests.TestHttpCapabilities260" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.GeometricPropertyDefinitionTests.SpecificGeometryTypesTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ConfigurationDocumentTests.TestMySqlSchema" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.SchemaTests.TestFeatureSchemaRoundtrip" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.CapabilityTests.TestHttpCapabilities100" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestMapDefinitionGroupAdd" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.CapabilityTests.TestHttpCapabilities230" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ConfigurationDocumentTests.TestWmsLoad2" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestLoadProcedureCon
versions" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestLayerDefinitionConversions" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.FeatureSchemaTests.GetItemTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ValidationTests.TestCase1896" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestMapDefinitionLayerAdd" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.SchemaTests.ClearIdentityPropertiesTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.FeatureReaderTests.TestXmlFeatureNullValues" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestMapDefinitionLayerReordering" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.SchemaTests.IndexOfPropertyTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.SchemaTests.CloneTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.MiscTests.TestParseXyzmWkt" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.MiscTests.TestConnectionString" /><Add Test="OSGeo.MapGuide.MaestroAPI.Schema.Tests.Featu
reSchemaTests.FeatureSchemaTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Tests.ResourceTests.TestMapDefinitionLayerInsert" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.RegisterLayerFactoryMethodTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateMapDefinitionTestWithNameAndCoordSys" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateWatermarkTest" /><Add Test="OSGeo.MapGuide.ObjectModel.Tests.FeatureSourceTests.TestFeatureSourceFileParameters" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateSimplePointTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateCalculatedPropertyTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreatePoint3DTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.RegisterCompoundSymbolFactoryMethodTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateSymbolLibraryTest" /><Add
Test="OSGeo.MapGuide.ObjectModel.Tests.ResourceTests.TestResourceTypeDescriptor" /><Add Test="OSGeo.MapGuide.ObjectModel.Tests.ResourceTests.TestValidResourceIdentifiers" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateMetadataTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.RegisterSimpleSymbolFactoryMethodTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.RegisterWatermarkDefinitionFactoryMethodTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateSecurityUserTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateSimpleSymbolTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateAttributeRelationTest" /><Add Test="OSGeo.MapGuide.ObjectModel.Tests.DrawingSourceTests.DrawingSourceDeserializationWithFullContentModel" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateFeatureSourceExtensionTest" /><Add Test="OSGeo.MapGu
ide.ObjectModels.Tests.ObjectFactoryTests.CreateLoadProcedureTest" /><Add Test="OSGeo.MapGuide.ObjectModel.Tests.ResourceTests.TestCloning" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.RegisterWebLayoutFactoryMethodTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateFeatureSourceTest" /><Add Test="OSGeo.MapGuide.ObjectModel.Tests.ApplicationDefinitionTests.ApplicationDefinitionDeserializationWithFullContentModel" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreatePrintLayoutTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateMapDefinitionTestWithNameAndCoordSysAndExtent" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreatePoint2DTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.RegisterResourceTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateSecurityGroupTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.Object
FactoryTests.CreateSimpleLabelTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateFeatureSourceTestWithParameters" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateSimpleSolidLineTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateLoadProcedureTestWithFileNames" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateEnvelopeTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateDefaultLayerTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateCompoundSymbolTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateSimpleSolidFillTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.RegisterResourceSerializerTest" /><Add Test="OSGeo.MapGuide.ObjectModel.Tests.FeatureSourceTests.FeatureSourceDeserializationWithFullContentModel" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.RegisterMap
DefinitionFactoryMethodTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.RegisterLoadProcedureFactoryMethodTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateDrawingSourceTest" /><Add Test="OSGeo.MapGuide.ObjectModels.Tests.ObjectFactoryTests.CreateMapDefinitionTestWithName" /><Add Test="OSGeo.MapGuide.MaestroAPI.CrossConnection.Tests.ResourceMigratorTests.ResourceMigratorTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.CrossConnection.Tests.ResourceMigratorTests.MoveResourcesWithOverwriteTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.CrossConnection.Tests.ResourceMigratorTests.CopyResourcesWithOverwriteTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.CrossConnection.Tests.ResourceMigratorTests.CopyResourcesWithoutOverwriteTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.CrossConnection.Tests.ResourceMigratorTests.MoveResourcesWithoutOverwriteTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.CrossConnection.Tests.ResourceRebaserTests.RebaseTest"
/><Add Test="OSGeo.MapGuide.MaestroAPI.CrossConnection.Tests.ResourceRebaserTests.ResourceRebaserTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.UnsupportedConnectionTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.GetLayerByNameTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.RemoveLayerAtTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.UpdateMapDefinitionTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.IndexOfLayerTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.RemoveGroupTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.SetViewCenterTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.GetGroupByNameTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.GetGroupsOfGroupTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.GetLayer
sOfGroupTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.RemoveLayerTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.GetLayerByObjectIdTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.InsertLayerTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.ToMapDefinitionTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.GetFiniteDisplayScaleAtTest" /><Add Test="OSGeo.MapGuide.MaestroAPI.Mapping.Tests.RuntimeMapTests.SetLayerIndexTest" /><Add Test="OSGeo.MapGuide.ObjectModel.Tests.CheckTests.NotNullTest" /><Add Test="OSGeo.MapGuide.ObjectModel.Tests.CheckTests.RangeTest" /><Add Test="OSGeo.MapGuide.ObjectModel.Tests.CheckTests.IsFolderTest" /><Add Test="OSGeo.MapGuide.ObjectModel.Tests.CheckTests.NotEmptyTest" /><Add Test="OSGeo.MapGuide.ObjectModel.Tests.CheckTests.PreconditionTest" /></Playlist>
\ No newline at end of file
More information about the mapguide-commits
mailing list