[mapguide-commits] r8717 - in trunk/Tools/Maestro: Maestro.Editors/Generic/XmlEditor/AutoCompletion Maestro.Editors/LayerDefinition/Vector OSGeo.MapGuide.MaestroAPI OSGeo.MapGuide.MaestroAPI/CoordinateSystem OSGeo.MapGuide.MaestroAPI/Internal OSGeo.MapGuide.MaestroAPI/Mapping OSGeo.MapGuide.ObjectModels OSGeo.MapGuide.ObjectModels/Properties OSGeo.MapGuide.ObjectModels/TileSetDefinition/v3_0_0 OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_4_0 OSGeo.MapGuide.ObjectModels/WebLayout/v1_0_0 OSGeo.MapGuide.ObjectModels/WebLayout/v1_1_0 OSGeo.MapGuide.ObjectModels/WebLayout/v2_4_0 OSGeo.MapGuide.ObjectModels/WebLayout/v2_6_0
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Jul 23 10:01:45 PDT 2015
Author: jng
Date: 2015-07-23 10:01:45 -0700 (Thu, 23 Jul 2015)
New Revision: 8717
Modified:
trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/QualifiedNameCollection.cs
trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlCompletionDataCollection.cs
trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlParser.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/FeaturePreviewRender.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ActualCoordinateSystem.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Internal/FixedWKTReader.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/Collections.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/MapSelection.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SiteVersion.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ObjectFactory.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Properties/AssemblyInfo.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceIdentifier.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypeRegistry.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/TileSetDefinition/v3_0_0/TileSetImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_4_0/WatermarkDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_0_0/WebLayoutImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_1_0/WebLayoutImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_4_0/WebLayoutImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_6_0/WebLayoutImpl.cs
Log:
#2565: More RES warning fixes
Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/QualifiedNameCollection.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/QualifiedNameCollection.cs 2015-07-23 16:44:29 UTC (rev 8716)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/QualifiedNameCollection.cs 2015-07-23 17:01:45 UTC (rev 8717)
@@ -39,7 +39,7 @@
/// <summary>
/// A collection that stores <see cref='QualifiedName'/> objects.
/// </summary>
- [Serializable()]
+ [Serializable]
internal class QualifiedNameCollection : CollectionBase
{
/// <summary>
Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlCompletionDataCollection.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlCompletionDataCollection.cs 2015-07-23 16:44:29 UTC (rev 8716)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlCompletionDataCollection.cs 2015-07-23 17:01:45 UTC (rev 8717)
@@ -40,7 +40,7 @@
/// <summary>
/// A collection that stores <see cref='XmlCompletionData'/> objects.
/// </summary>
- [Serializable()]
+ [Serializable]
internal class XmlCompletionDataCollection : CollectionBase
{
/// <summary>
Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlParser.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlParser.cs 2015-07-23 16:44:29 UTC (rev 8716)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlParser.cs 2015-07-23 17:01:45 UTC (rev 8717)
@@ -99,7 +99,7 @@
}
}
- private static readonly char[] whitespaceCharacters = new char[] { ' ', '\n', '\t', '\r' };
+ private static readonly char[] whitespaceCharacters = { ' ', '\n', '\t', '\r' };
private XmlParser()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/FeaturePreviewRender.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/FeaturePreviewRender.cs 2015-07-23 16:44:29 UTC (rev 8716)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/FeaturePreviewRender.cs 2015-07-23 17:01:45 UTC (rev 8717)
@@ -46,8 +46,7 @@
//Adjust, since painting always excludes top/right and includes left/bottom
Rectangle size_adj = new Rectangle(size.X, size.Y, size.Width - 1, size.Height - 1);
- Point[] points = new Point[]
- {
+ Point[] points = {
new Point(size_adj.Left, size_adj.Top),
new Point(size_adj.Right, size_adj.Top),
new Point(size_adj.Right, size_adj.Bottom),
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ActualCoordinateSystem.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ActualCoordinateSystem.cs 2015-07-23 16:44:29 UTC (rev 8716)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ActualCoordinateSystem.cs 2015-07-23 17:01:45 UTC (rev 8717)
@@ -38,7 +38,7 @@
internal ActualCoordinateSystem(ICoordinateSystem coordinateSystem)
{
if (coordinateSystem == null)
- throw new ArgumentNullException("coordinateSystem"); //NOXLATE
+ throw new ArgumentNullException(nameof(coordinateSystem)); //NOXLATE
CoordinateTransformationFactory f = new CoordinateTransformationFactory();
CoordinateSystemFactory cf = new CoordinateSystemFactory();
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Internal/FixedWKTReader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Internal/FixedWKTReader.cs 2015-07-23 16:44:29 UTC (rev 8716)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Internal/FixedWKTReader.cs 2015-07-23 17:01:45 UTC (rev 8717)
@@ -202,7 +202,7 @@
Token token = tokens[index++] as Token;
if (token == null)
- throw new ArgumentNullException("tokens", Strings.ErrorTokenListContainsNullValue); //NOXLATE
+ throw new ArgumentNullException(nameof(tokens), Strings.ErrorTokenListContainsNullValue); //NOXLATE
else if (token is EofToken)
throw new ParseException(Strings.ErrorParseExpectedNumberEos);
else if (token is EolToken)
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/Collections.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/Collections.cs 2015-07-23 16:44:29 UTC (rev 8716)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/Collections.cs 2015-07-23 17:01:45 UTC (rev 8717)
@@ -537,15 +537,15 @@
/// <summary>
/// Adds the specified layer.
/// </summary>
- /// <param name="layer">The layer.</param>
- public override void Add(RuntimeMapLayer layer)
+ /// <param name="item">The layer.</param>
+ public override void Add(RuntimeMapLayer item)
{
//calculate and set the zorder for the new layer
RuntimeMapLayer prevLayer = (this.Count == 0) ? null : this[this.Count - 1];
double zOrder = prevLayer == null ? RuntimeMap.Z_ORDER_TOP : prevLayer.DisplayOrder + RuntimeMap.Z_ORDER_INCREMENT;
- layer.DisplayOrder = zOrder;
+ item.DisplayOrder = zOrder;
- base.Add(layer);
+ base.Add(item);
}
/// <summary>
@@ -569,32 +569,32 @@
/// <summary>
/// Called when [before item added].
/// </summary>
- /// <param name="layer">The layer.</param>
- protected override void OnBeforeItemAdded(RuntimeMapLayer layer)
+ /// <param name="item">The layer.</param>
+ protected override void OnBeforeItemAdded(RuntimeMapLayer item)
{
- if (_layerIdMap.ContainsKey(layer.ObjectId))
- throw new DuplicateKeyException(string.Format(Strings.DuplicateKeyExceptionMessage, layer.ObjectId));
+ if (_layerIdMap.ContainsKey(item.ObjectId))
+ throw new DuplicateKeyException(string.Format(Strings.DuplicateKeyExceptionMessage, item.ObjectId));
}
/// <summary>
/// Called when [item added].
/// </summary>
- /// <param name="layer">The layer.</param>
- protected override void OnItemAdded(RuntimeMapLayer layer)
+ /// <param name="item">The layer.</param>
+ protected override void OnItemAdded(RuntimeMapLayer item)
{
- _layerIdMap[layer.ObjectId] = layer;
- _parent.OnLayerAdded(layer);
+ _layerIdMap[item.ObjectId] = item;
+ _parent.OnLayerAdded(item);
}
/// <summary>
/// Called when [item removed].
/// </summary>
- /// <param name="layer">The layer.</param>
- protected override void OnItemRemoved(RuntimeMapLayer layer)
+ /// <param name="value">The layer.</param>
+ protected override void OnItemRemoved(RuntimeMapLayer value)
{
- if (_layerIdMap.ContainsKey(layer.ObjectId))
- _layerIdMap.Remove(layer.ObjectId);
- _parent.OnLayerRemoved(layer);
+ if (_layerIdMap.ContainsKey(value.ObjectId))
+ _layerIdMap.Remove(value.ObjectId);
+ _parent.OnLayerRemoved(value);
}
/// <summary>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/MapSelection.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/MapSelection.cs 2015-07-23 16:44:29 UTC (rev 8716)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/MapSelection.cs 2015-07-23 17:01:45 UTC (rev 8717)
@@ -305,7 +305,7 @@
public LayerSelection(RuntimeMapLayer layer)
{
if (layer == null)
- throw new ArgumentNullException("layer"); //NOXLATE
+ throw new ArgumentNullException(nameof(layer)); //NOXLATE
if (layer.IdentityProperties.Length == 0 && layer.Parent.StrictSelection)
throw new Exception(Strings.ErrorLayerHasNoPk);
@@ -334,7 +334,7 @@
private object[] NormalizeAndValidate(object[] values)
{
if (values == null)
- throw new ArgumentNullException("values"); //NOXLATE
+ throw new ArgumentNullException(nameof(values)); //NOXLATE
if (values.Length != m_layer.IdentityProperties.Length)
throw new Exception(string.Format(Strings.ErrorLayerKeyMismatch, m_layer.IdentityProperties.Length, values.Length));
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs 2015-07-23 16:44:29 UTC (rev 8716)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs 2015-07-23 17:01:45 UTC (rev 8717)
@@ -1384,7 +1384,7 @@
public virtual void SetFolderOrResourceHeader(string resourceID, object header)
{
if (header == null)
- throw new ArgumentNullException("header"); //NOXLATE
+ throw new ArgumentNullException(nameof(header)); //NOXLATE
ObjCommon.ResourceSecurityType sec;
if (header as ObjCommon.ResourceFolderHeaderType != null)
@@ -1392,7 +1392,7 @@
else if (header as ObjCommon.ResourceDocumentHeaderType != null)
sec = (header as ObjCommon.ResourceDocumentHeaderType).Security;
else
- throw new ArgumentException(Strings.ErrorInvalidResourceHeaderRootElement, "header"); //NOXLATE
+ throw new ArgumentException(Strings.ErrorInvalidResourceHeaderRootElement, nameof(header)); //NOXLATE
if (sec.Users != null && sec.Users.User != null && sec.Users.User.Count == 0)
sec.Users = null;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SiteVersion.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SiteVersion.cs 2015-07-23 16:44:29 UTC (rev 8716)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SiteVersion.cs 2015-07-23 17:01:45 UTC (rev 8717)
@@ -153,9 +153,8 @@
/// <summary>
/// The array of supported site versions
/// </summary>
- public static readonly Version[] SiteVersionNumbers = new Version[]
- {
- new Version(1,0,0,17864), //MGE 2007
+ private static readonly Version[] siteVersionNumbers = {
+ new Version(1,0,0,17864), //MGE 2007
new Version(1,1,0,301), //MGOS 1.1.0
new Version(1,2,0,1307), //MGOS 1.2.0
new Version(1,2,0,4103), //MGE 2008
@@ -180,6 +179,14 @@
new Version(2,5,1,7768) //MGOS 2.5.1
};
+ public static Version[] SiteVersionNumbers
+ {
+ get
+ {
+ return siteVersionNumbers;
+ }
+ }
+
/// <summary>
/// Gets the specified version by the known site version identifier
/// </summary>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ObjectFactory.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ObjectFactory.cs 2015-07-23 16:44:29 UTC (rev 8716)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ObjectFactory.cs 2015-07-23 17:01:45 UTC (rev 8717)
@@ -545,10 +545,10 @@
public static IEnvelope CreateEnvelope(double minx, double miny, double maxx, double maxy)
{
if (minx > maxx)
- throw new ArgumentException("minx > maxx", "minx"); //NOXLATE
+ throw new ArgumentException($"{nameof(minx)} > {nameof(maxx)}", nameof(minx)); //NOXLATE
if (miny > maxy)
- throw new ArgumentException("miny > maxy", "miny"); //NOXLATE
+ throw new ArgumentException($"{nameof(miny)} > {nameof(maxy)}", nameof(miny)); //NOXLATE
return new Envelope()
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Properties/AssemblyInfo.cs 2015-07-23 16:44:29 UTC (rev 8716)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Properties/AssemblyInfo.cs 2015-07-23 17:01:45 UTC (rev 8717)
@@ -38,4 +38,6 @@
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancies in Code", "RECS0145:Removes 'private' modifiers that are not required", Justification = "The author likes to be explicit with accessibility modifiers")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancies in Code", "RECS0129:Removes 'internal' modifiers that are not required", Justification = "The author likes to be explicit with accessibility modifiers")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Language", "CSE0003:Use expression-bodied members", Justification = "The author prefers debuggability over succintness")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancies in Symbol Declarations", "RECS0007:The default underlying type of enums is int, so defining it explicitly is redundant.", Justification = "The author prefers to be explicit about underlying enum types")]
\ No newline at end of file
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancies in Symbol Declarations", "RECS0007:The default underlying type of enums is int, so defining it explicitly is redundant.", Justification = "The author prefers to be explicit about underlying enum types")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancies in Symbol Declarations", "RECS0072", Justification = "The author prefers explicit context for non-field member access")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancies in Symbol Declarations", "IDE0003", Justification = "The author prefers explicit context for non-field member access")]
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceIdentifier.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceIdentifier.cs 2015-07-23 16:44:29 UTC (rev 8716)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceIdentifier.cs 2015-07-23 17:01:45 UTC (rev 8717)
@@ -65,11 +65,11 @@
public ResourceIdentifier(string name, ResourceTypes type)
{
if (string.IsNullOrEmpty(name))
- throw new ArgumentNullException("name"); //NOXLATE
+ throw new ArgumentNullException(nameof(name)); //NOXLATE
if (name.IndexOf(".") > 0 || name.IndexOf("//") > 0 || name.IndexOf(":") > 0) //NOXLATE
- throw new ArgumentException(Strings.ErrorResourceIdentifierInvalidChars, "name"); //NOXLATE
+ throw new ArgumentException(Strings.ErrorResourceIdentifierInvalidChars, nameof(name)); //NOXLATE
if (!Enum.IsDefined(typeof(ResourceTypes), type))
- throw new ArgumentException(Strings.ErrorUnknownResourceType, "type"); //NOXLATE
+ throw new ArgumentException(Strings.ErrorUnknownResourceType, nameof(type)); //NOXLATE
m_id = ROOT_IDENTIFIER + name + ResourceName(type, true);
}
@@ -285,12 +285,12 @@
public static string GetName(string identifier)
{
if (string.IsNullOrEmpty(identifier))
- throw new ArgumentNullException("identifier"); //NOXLATE
+ throw new ArgumentNullException(nameof(identifier)); //NOXLATE
string temp = GetPath(identifier);
if (string.IsNullOrEmpty(temp))
- throw new ArgumentException(Strings.ErrorInvalidResourceIdentifier, "identifier"); //NOXLATE
+ throw new ArgumentException(Strings.ErrorInvalidResourceIdentifier, nameof(identifier)); //NOXLATE
return temp.Substring(temp.LastIndexOf("/") + 1); //NOXLATE
}
@@ -313,7 +313,7 @@
newname += "." + GetExtension(identifier); //NOXLATE
if (newname.IndexOf("/") > 0) //NOXLATE
- throw new ArgumentException(Strings.ErrorResourceIdentifierNameInvalidChars, "newname");
+ throw new ArgumentException(Strings.ErrorResourceIdentifierNameInvalidChars, nameof(newname));
temp = temp.Substring(0, temp.Length - GetName(identifier).Length) + newname;
return GetRepository(identifier) + temp;
@@ -349,7 +349,7 @@
newextension = "." + newextension; //NOXLATE
if (newextension.LastIndexOf(".") > 0) //NOXLATE
- throw new ArgumentException(Strings.ErrorResourceIdInvalidExtension, "newextension"); //NOXLATE
+ throw new ArgumentException(Strings.ErrorResourceIdInvalidExtension, nameof(newextension)); //NOXLATE
return identifier.Substring(0, identifier.Length - GetExtension(identifier).Length - 1) + newextension;
}
@@ -362,14 +362,14 @@
public static string GetRepository(string identifier)
{
if (string.IsNullOrEmpty(identifier))
- throw new ArgumentNullException("identifier"); //NOXLATE
+ throw new ArgumentNullException(nameof(identifier)); //NOXLATE
int ix = identifier.IndexOf("//"); //NOXLATE
if (ix <= 0)
- throw new ArgumentException(Strings.ErrorInvalidResourceIdentifier, "identifier"); //NOXLATE
+ throw new ArgumentException(Strings.ErrorInvalidResourceIdentifier, nameof(identifier)); //NOXLATE
string repo = identifier.Substring(0, ix);
if (repo != "Library:" && !repo.StartsWith("Session:")) //NOXLATE
- throw new ArgumentException(Strings.ErrorInvalidResourceIdentifierType, "identifier"); //NOXLATE
+ throw new ArgumentException(Strings.ErrorInvalidResourceIdentifierType, nameof(identifier)); //NOXLATE
return repo + "//"; //NOXLATE
}
@@ -382,7 +382,7 @@
public static string GetFullpath(string identifier)
{
if (string.IsNullOrEmpty(identifier))
- throw new ArgumentNullException("identifier"); //NOXLATE
+ throw new ArgumentNullException(nameof(identifier)); //NOXLATE
return identifier.Substring(GetRepository(identifier).Length);
}
@@ -394,7 +394,7 @@
public static string GetPath(string identifier)
{
if (string.IsNullOrEmpty(identifier))
- throw new ArgumentNullException("identifier"); //NOXLATE
+ throw new ArgumentNullException(nameof(identifier)); //NOXLATE
return identifier.Substring(GetRepository(identifier).Length, identifier.Length - GetExtension(identifier).Length - GetRepository(identifier).Length - 1);
}
@@ -431,14 +431,14 @@
private static string GetExtension(string identifier)
{
if (string.IsNullOrEmpty(identifier))
- throw new ArgumentNullException("identifier"); //NOXLATE
+ throw new ArgumentNullException(nameof(identifier)); //NOXLATE
if (identifier.EndsWith("/")) //NOXLATE
return string.Empty;
int ix = identifier.LastIndexOf("."); //NOXLATE
if (ix <= 0)
- throw new ArgumentException(Strings.ErrorInvalidResourceIdentifier, "identifier"); //NOXLATE
+ throw new ArgumentException(Strings.ErrorInvalidResourceIdentifier, nameof(identifier)); //NOXLATE
return identifier.Substring(ix + 1);
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypeRegistry.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypeRegistry.cs 2015-07-23 16:44:29 UTC (rev 8716)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypeRegistry.cs 2015-07-23 17:01:45 UTC (rev 8717)
@@ -188,7 +188,7 @@
public static void RegisterResource(ResourceTypeDescriptor desc, ResourceSerializer serializer)
{
if (_serializers.ContainsKey(desc))
- throw new ArgumentException(string.Format(Strings.ERR_SERIALIZER_ALREADY_REGISTERED, desc.ResourceType, desc.Version), "desc"); //NOXLATE
+ throw new ArgumentException(string.Format(Strings.ERR_SERIALIZER_ALREADY_REGISTERED, desc.ResourceType, desc.Version), nameof(desc)); //NOXLATE
_serializers.Add(desc, serializer);
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/TileSetDefinition/v3_0_0/TileSetImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/TileSetDefinition/v3_0_0/TileSetImpl.cs 2015-07-23 16:44:29 UTC (rev 8716)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/TileSetDefinition/v3_0_0/TileSetImpl.cs 2015-07-23 17:01:45 UTC (rev 8717)
@@ -275,7 +275,7 @@
throw new InvalidOperationException();
if (index >= this.ScaleCount)
- throw new ArgumentOutOfRangeException("index");
+ throw new ArgumentOutOfRangeException(nameof(index));
var list = new List<double>(this.GetDefaultFiniteScaleList());
list.RemoveAt(index);
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_4_0/WatermarkDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_4_0/WatermarkDefinitionImpl.cs 2015-07-23 16:44:29 UTC (rev 8716)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_4_0/WatermarkDefinitionImpl.cs 2015-07-23 17:01:45 UTC (rev 8717)
@@ -381,7 +381,7 @@
[XmlIgnore]
public override OSGeo.MapGuide.ObjectModels.WatermarkDefinition.PositionType Type
{
- get { return OSGeo.MapGuide.ObjectModels.WatermarkDefinition.PositionType.Tile; ; }
+ get { return OSGeo.MapGuide.ObjectModels.WatermarkDefinition.PositionType.Tile; }
}
[XmlIgnore]
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_0_0/WebLayoutImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_0_0/WebLayoutImpl.cs 2015-07-23 16:44:29 UTC (rev 8716)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_0_0/WebLayoutImpl.cs 2015-07-23 17:01:45 UTC (rev 8717)
@@ -1481,7 +1481,7 @@
this.SubItem.Remove(i);
i.Parent = null;
OnPropertyChanged(nameof(SubItem));
- };
+ }
}
public bool MoveUp(IUIItem item)
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_1_0/WebLayoutImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_1_0/WebLayoutImpl.cs 2015-07-23 16:44:29 UTC (rev 8716)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_1_0/WebLayoutImpl.cs 2015-07-23 17:01:45 UTC (rev 8717)
@@ -1482,7 +1482,7 @@
this.SubItem.Remove(i);
i.Parent = null;
OnPropertyChanged(nameof(SubItem));
- };
+ }
}
public bool MoveUp(IUIItem item)
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_4_0/WebLayoutImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_4_0/WebLayoutImpl.cs 2015-07-23 16:44:29 UTC (rev 8716)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_4_0/WebLayoutImpl.cs 2015-07-23 17:01:45 UTC (rev 8717)
@@ -1483,7 +1483,7 @@
this.SubItem.Remove(i);
i.Parent = null;
OnPropertyChanged(nameof(SubItem));
- };
+ }
}
public bool MoveUp(IUIItem item)
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_6_0/WebLayoutImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_6_0/WebLayoutImpl.cs 2015-07-23 16:44:29 UTC (rev 8716)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_6_0/WebLayoutImpl.cs 2015-07-23 17:01:45 UTC (rev 8717)
@@ -1484,7 +1484,7 @@
this.SubItem.Remove(i);
i.Parent = null;
OnPropertyChanged(nameof(SubItem));
- };
+ }
}
public bool MoveUp(IUIItem item)
More information about the mapguide-commits
mailing list