[mapguide-commits] r8739 - in trunk/Tools/Maestro: Maestro.Login MgCooker MgCooker.Cmd OSGeo.MapGuide.MaestroAPI.Tests/CrossConnection OSGeo.MapGuide.MaestroAPI.Tests/Mapping OSGeo.MapGuide.MaestroAPI.Tests/Resource OSGeo.MapGuide.MaestroAPI.Tests/Schema OSGeo.MapGuide.ObjectModel.Tests OSGeo.MapGuide.ObjectModels OSGeo.MapGuide.ObjectModels/ApplicationDefinition OSGeo.MapGuide.ObjectModels/Common OSGeo.MapGuide.ObjectModels/FeatureSource OSGeo.MapGuide.ObjectModels/LayerDefinition OSGeo.MapGuide.ObjectModels/LoadProcedure OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0 OSGeo.MapGuide.ObjectModels/MapDefinition OSGeo.MapGuide.ObjectModels/MapDefinition/v1_0_0 OSGeo.MapGuide.ObjectModels/MapDefinition/v2_3_0 OSGeo.MapGuide.ObjectModels/MapDefinition/v2_4_0 OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0 OSGeo.MapGuide.ObjectModels/SymbolDefinition OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_0_0 OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_1_0 OSGeo.MapGuide.ObjectModels/SymbolDefinitio n/v2_4_0 OSGeo.MapGuide.ObjectModels/WatermarkDefinition OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_3_0 OSGeo.MapGuide.ObjectModels/WebLayout Properties
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Aug 11 09:22:58 PDT 2015
Author: jng
Date: 2015-08-11 09:22:58 -0700 (Tue, 11 Aug 2015)
New Revision: 8739
Modified:
trunk/Tools/Maestro/Maestro.Login/PreferedSite.cs
trunk/Tools/Maestro/MgCooker.Cmd/Program.cs
trunk/Tools/Maestro/MgCooker/Program.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/CrossConnection/ResourceMigratorTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/CrossConnection/ResourceRebaserTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Mapping/RuntimeMapTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Resource/ResourceSchemaChainTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/ClassDefinitionTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/DataPropertyDefinitionTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/FeatureSchemaTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/GeometricPropertyDefinitionTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/MapDefinitionTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/ObjectFactoryTests.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/ApplicationDefinitionInterfaces.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ExtendedDataType.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IEnvelope.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ResourceList.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/TileProviderList.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/LoadProcedure/LoadProcedureInterfaces.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0/LoadProcedureImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/MapDefinitionInterfaces.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v1_0_0/MapDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_3_0/MapDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_4_0/MapDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0/MapDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceIdentifier.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/SymbolDefinitionInterfaces.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_0_0/SymbolDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_1_0/SymbolDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v2_4_0/SymbolDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/UntypedResource.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/WatermarkDefinitionInterfaces.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_3_0/WatermarkDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/WebLayoutInterfaces.cs
trunk/Tools/Maestro/Properties/CodeAnalysisRules.cs
Log:
#2565: The RES-instigated cleanup continues.
Modified: trunk/Tools/Maestro/Maestro.Login/PreferedSite.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Login/PreferedSite.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/Maestro.Login/PreferedSite.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -352,7 +352,7 @@
/// Gets or sets the approved version.
/// </summary>
/// <value>The approved version.</value>
- [System.Xml.Serialization.XmlIgnore()]
+ [System.Xml.Serialization.XmlIgnore]
public Version ApprovedVersion
{
get
Modified: trunk/Tools/Maestro/MgCooker/Program.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/Program.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/MgCooker/Program.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -52,7 +52,7 @@
private static bool hasConsole = true;
- [STAThread()]
+ [STAThread]
public static void Main(string[] args)
{
System.Windows.Forms.Application.EnableVisualStyles();
Modified: trunk/Tools/Maestro/MgCooker.Cmd/Program.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker.Cmd/Program.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/MgCooker.Cmd/Program.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -27,7 +27,7 @@
{
internal class Program
{
- [STAThread()]
+ [STAThread]
private static void Main(string[] args)
{
//Append the "/commandline" switch
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/CrossConnection/ResourceMigratorTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/CrossConnection/ResourceMigratorTests.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/CrossConnection/ResourceMigratorTests.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -32,10 +32,10 @@
using OSGeo.MapGuide.ObjectModels.Common;
namespace OSGeo.MapGuide.MaestroAPI.CrossConnection.Tests
{
- [TestFixture()]
+ [TestFixture]
public class ResourceMigratorTests
{
- [Test()]
+ [Test]
public void ResourceMigratorTest()
{
var source = new Mock<IServerConnection>();
@@ -50,7 +50,7 @@
Assert.NotNull(mig.Target);
}
- [Test()]
+ [Test]
public void CopyResourcesWithOverwriteTest()
{
var sr = new Mock<IResourceService>();
@@ -119,7 +119,7 @@
tr.Verify(c => c.SaveResourceAs(It.IsAny<IResource>(), It.IsAny<string>()), Times.Exactly(5));
}
- [Test()]
+ [Test]
public void CopyResourcesWithoutOverwriteTest()
{
var sr = new Mock<IResourceService>();
@@ -197,7 +197,7 @@
tr.Verify(c => c.SaveResourceAs(It.IsAny<IResource>(), "Library://Migrated/Data4.FeatureSource"), Times.Once);
}
- [Test()]
+ [Test]
public void MoveResourcesWithOverwriteTest()
{
var sr = new Mock<IResourceService>();
@@ -272,7 +272,7 @@
sr.Verify(c => c.DeleteResource(resources[4]), Times.Once);
}
- [Test()]
+ [Test]
public void MoveResourcesWithoutOverwriteTest()
{
var sr = new Mock<IResourceService>();
@@ -356,7 +356,7 @@
sr.Verify(c => c.DeleteResource(resources[4]), Times.Once);
}
- //[Test()]
+ //[Test]
//public void MigrateResourceTest()
//{
// Assert.Fail();
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/CrossConnection/ResourceRebaserTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/CrossConnection/ResourceRebaserTests.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/CrossConnection/ResourceRebaserTests.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -34,10 +34,10 @@
namespace OSGeo.MapGuide.MaestroAPI.CrossConnection.Tests
{
- [TestFixture()]
+ [TestFixture]
public class ResourceRebaserTests
{
- [Test()]
+ [Test]
public void ResourceRebaserTest()
{
Assert.Throws<ArgumentNullException>(() => new ResourceRebaser(null));
@@ -46,7 +46,7 @@
var rbaser = new ResourceRebaser(res.Object);
}
- [Test()]
+ [Test]
public void RebaseTest()
{
var res = (IMapDefinition)ObjectFactory.Deserialize(ResourceTypes.MapDefinition.ToString(), File.OpenRead("UserTestData\\TestTiledMap.xml"));
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Mapping/RuntimeMapTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Mapping/RuntimeMapTests.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Mapping/RuntimeMapTests.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -1,23 +1,23 @@
-#region Disclaimer / License
-
-// Copyright (C) 2014, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
+#region Disclaimer / License
+
+// Copyright (C) 2014, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
#endregion Disclaimer / License
using Moq;
@@ -36,7 +36,7 @@
namespace OSGeo.MapGuide.MaestroAPI.Mapping.Tests
{
- [TestFixture()]
+ [TestFixture]
public class RuntimeMapTests
{
private static RuntimeMap CreateTestMap()
@@ -86,7 +86,7 @@
return map;
}
- [Test()]
+ [Test]
public void UnsupportedConnectionTest()
{
var res = (IMapDefinition)ObjectFactory.Deserialize(ResourceTypes.MapDefinition.ToString(), File.OpenRead("UserTestData\\TestTiledMap.xml"));
@@ -99,7 +99,7 @@
Assert.Throws<NotSupportedException>(() => new RuntimeMap(conn.Object, res, 1.0, true));
}
- [Test()]
+ [Test]
public void GetFiniteDisplayScaleAtTest()
{
var map = CreateTestMap();
@@ -111,7 +111,7 @@
}
}
- [Test()]
+ [Test]
public void SetViewCenterTest()
{
var map = CreateTestMap();
@@ -120,7 +120,7 @@
Assert.AreEqual(23, map.ViewCenter.Y);
}
- [Test()]
+ [Test]
public void GetGroupByNameTest()
{
var map = CreateTestMap();
@@ -128,7 +128,7 @@
Assert.Null(map.Groups["asjgsfdsf"]);
}
- [Test()]
+ [Test]
public void GetLayerByObjectIdTest()
{
var map = CreateTestMap();
@@ -139,7 +139,7 @@
Assert.Null(map.GetLayerByObjectId("asjgsfdsf"));
}
- [Test()]
+ [Test]
public void InsertLayerTest()
{
var map = CreateTestMap();
@@ -157,7 +157,7 @@
Assert.AreSame(lyr, lyr2);
}
- [Test()]
+ [Test]
public void SetLayerIndexTest()
{
var map = CreateTestMap();
@@ -176,7 +176,7 @@
Assert.AreSame(lyr, lyr2);
}
- [Test()]
+ [Test]
public void RemoveLayerAtTest()
{
var map = CreateTestMap();
@@ -189,7 +189,7 @@
Assert.Null(map.Layers[lyr.Name]);
}
- [Test()]
+ [Test]
public void IndexOfLayerTest()
{
var map = CreateTestMap();
@@ -199,7 +199,7 @@
Assert.Less(map.IndexOfLayer("sdjgdsfasdf"), 0);
}
- [Test()]
+ [Test]
public void RemoveLayerTest()
{
var map = CreateTestMap();
@@ -210,7 +210,7 @@
Assert.AreEqual(2, map.Layers.Count);
}
- [Test()]
+ [Test]
public void RemoveGroupTest()
{
var map = CreateTestMap();
@@ -224,7 +224,7 @@
Assert.AreEqual(0, map.Groups.Count);
}
- [Test()]
+ [Test]
public void GetLayersOfGroupTest()
{
var map = CreateTestMap();
@@ -234,7 +234,7 @@
Assert.AreEqual(0, layers.Length);
}
- [Test()]
+ [Test]
public void GetGroupsOfGroupTest()
{
var map = CreateTestMap();
@@ -253,7 +253,7 @@
Assert.AreEqual(0, groups.Length);
}
- [Test()]
+ [Test]
public void GetLayerByNameTest()
{
var map = CreateTestMap();
@@ -263,7 +263,7 @@
Assert.Null(map.Layers["sdhgdsafdsfd"]);
}
- [Test()]
+ [Test]
public void UpdateMapDefinitionTest()
{
var map = CreateTestMap();
@@ -278,7 +278,7 @@
Assert.AreEqual("Base Layer Group", grp.Name);
}
- [Test()]
+ [Test]
public void ToMapDefinitionTest()
{
var map = CreateTestMap();
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Resource/ResourceSchemaChainTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Resource/ResourceSchemaChainTests.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Resource/ResourceSchemaChainTests.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -1,23 +1,23 @@
-#region Disclaimer / License
-
-// Copyright (C) 2014, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
+#region Disclaimer / License
+
+// Copyright (C) 2014, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
#endregion Disclaimer / License
using System;
@@ -29,10 +29,10 @@
namespace OSGeo.MapGuide.MaestroAPI.Resource.Tests
{
- [TestFixture()]
+ [TestFixture]
public class ResourceSchemaChainTests
{
- [Test()]
+ [Test]
public void GetValidatingSchemasTest()
{
var schemas = ResourceSchemaChain.GetValidatingSchemas("LayerDefinition-1.0.0.xsd");
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/ClassDefinitionTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/ClassDefinitionTests.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/ClassDefinitionTests.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -1,23 +1,23 @@
-#region Disclaimer / License
-
-// Copyright (C) 2014, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
+#region Disclaimer / License
+
+// Copyright (C) 2014, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
#endregion Disclaimer / License
using System;
using System.Collections.Generic;
@@ -29,10 +29,10 @@
using System.IO;
namespace OSGeo.MapGuide.MaestroAPI.Schema.Tests
{
- [TestFixture()]
+ [TestFixture]
public class SchemaTests
{
- [Test()]
+ [Test]
public void ClassDefinitionTest()
{
Assert.Throws<ArgumentNullException>(() => new ClassDefinition(null, ""));
@@ -46,7 +46,7 @@
Assert.Null(cls.Parent);
}
- [Test()]
+ [Test]
public void GetOrdinalTest()
{
var cls = new ClassDefinition("Foo", "Bar");
@@ -58,7 +58,7 @@
Assert.GreaterOrEqual(cls.GetOrdinal("Prop1"), 0);
}
- [Test()]
+ [Test]
public void ClearIdentityPropertiesTest()
{
var cls = new ClassDefinition("Foo", "Bar");
@@ -74,7 +74,7 @@
Assert.AreEqual(0, cls.IdentityProperties.Count);
}
- [Test()]
+ [Test]
public void IndexOfPropertyTest()
{
var cls = new ClassDefinition("Foo", "Bar");
@@ -92,7 +92,7 @@
Assert.GreaterOrEqual(cls.IndexOfProperty(prop), 0);
}
- [Test()]
+ [Test]
public void RemovePropertyTest()
{
var cls = new ClassDefinition("Foo", "Bar");
@@ -118,7 +118,7 @@
Assert.Less(cls.IndexOfProperty(prop), 0);
}
- [Test()]
+ [Test]
public void RemovePropertyAtTest()
{
var cls = new ClassDefinition("Foo", "Bar");
@@ -148,7 +148,7 @@
Assert.Less(cls.IndexOfProperty(prop), 0);
}
- [Test()]
+ [Test]
public void FindPropertyTest()
{
var cls = new ClassDefinition("Foo", "Bar");
@@ -169,7 +169,7 @@
Assert.NotNull(cls.FindProperty("Prop1"));
}
- [Test()]
+ [Test]
public void CloneTest()
{
var cls = new ClassDefinition("Foo", "Bar");
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/DataPropertyDefinitionTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/DataPropertyDefinitionTests.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/DataPropertyDefinitionTests.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -1,23 +1,23 @@
-#region Disclaimer / License
-
-// Copyright (C) 2014, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
+#region Disclaimer / License
+
+// Copyright (C) 2014, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
#endregion Disclaimer / License
using System;
using System.Collections.Generic;
@@ -28,10 +28,10 @@
namespace OSGeo.MapGuide.MaestroAPI.Schema.Tests
{
- [TestFixture()]
+ [TestFixture]
public class DataPropertyDefinitionTests
{
- [Test()]
+ [Test]
public void DataPropertyDefinitionTest()
{
var prop = new DataPropertyDefinition("Foo", "Bar");
@@ -40,7 +40,7 @@
Assert.AreEqual(DataPropertyType.String, prop.DataType);
}
- [Test()]
+ [Test]
public void IsNumericTypeTest()
{
var prop = new DataPropertyDefinition("Foo", "Bar");
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/FeatureSchemaTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/FeatureSchemaTests.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/FeatureSchemaTests.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -1,23 +1,23 @@
-#region Disclaimer / License
-
-// Copyright (C) 2014, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
+#region Disclaimer / License
+
+// Copyright (C) 2014, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
#endregion Disclaimer / License
using System;
using System.Collections.Generic;
@@ -28,10 +28,10 @@
using System.Xml;
namespace OSGeo.MapGuide.MaestroAPI.Schema.Tests
{
- [TestFixture()]
+ [TestFixture]
public class FeatureSchemaTests
{
- [Test()]
+ [Test]
public void FeatureSchemaTest()
{
var fs = new FeatureSchema();
@@ -50,7 +50,7 @@
Assert.AreEqual(0, fs.Classes.Count);
}
- [Test()]
+ [Test]
public void AddClassTest()
{
var fs = new FeatureSchema("Foo", "Bar");
@@ -63,7 +63,7 @@
Assert.AreEqual(1, fs.Classes.Count);
}
- [Test()]
+ [Test]
public void RemoveClassTest()
{
var fs = new FeatureSchema("Foo", "Bar");
@@ -87,7 +87,7 @@
Assert.AreEqual(0, fs.Classes.Count);
}
- [Test()]
+ [Test]
public void GetClassTest()
{
var fs = new FeatureSchema("Foo", "Bar");
@@ -101,7 +101,7 @@
Assert.NotNull(fs.GetClass("Class1"));
}
- [Test()]
+ [Test]
public void IndexOfTest()
{
var fs = new FeatureSchema("Foo", "Bar");
@@ -117,7 +117,7 @@
Assert.Less(fs.IndexOf(cls), 0);
}
- [Test()]
+ [Test]
public void GetItemTest()
{
var fs = new FeatureSchema("Foo", "Bar");
@@ -135,7 +135,7 @@
Assert.Throws<ArgumentOutOfRangeException>(() => fs.GetItem(0));
}
- [Test()]
+ [Test]
public void WriteXmlTest()
{
var fs = new FeatureSchema("Foo", "Bar");
@@ -159,7 +159,7 @@
Assert.IsNotNullOrEmpty(xml);
}
- [Test()]
+ [Test]
public void CloneTest()
{
var fs = new FeatureSchema("Foo", "Bar");
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/GeometricPropertyDefinitionTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/GeometricPropertyDefinitionTests.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Tests/Schema/GeometricPropertyDefinitionTests.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -1,23 +1,23 @@
-#region Disclaimer / License
-
-// Copyright (C) 2014, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
+#region Disclaimer / License
+
+// Copyright (C) 2014, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
#endregion Disclaimer / License
using System;
using System.Collections.Generic;
@@ -27,10 +27,10 @@
using NUnit.Framework;
namespace OSGeo.MapGuide.MaestroAPI.Schema.Tests
{
- [TestFixture()]
+ [TestFixture]
public class GeometricPropertyDefinitionTests
{
- [Test()]
+ [Test]
public void GeometricPropertyDefinitionTest()
{
var prop = new GeometricPropertyDefinition("Foo", "Bar");
@@ -40,7 +40,7 @@
Assert.IsNullOrEmpty(prop.SpatialContextAssociation);
}
- [Test()]
+ [Test]
public void GeometryTypesToStringTest()
{
var prop = new GeometricPropertyDefinition("Foo", "Bar");
@@ -57,7 +57,7 @@
Assert.Less(types.IndexOf("surface"), 0);
}
- [Test()]
+ [Test]
public void GetIndividualGeometricTypesTest()
{
var prop = new GeometricPropertyDefinition("Foo", "Bar");
@@ -75,7 +75,7 @@
Assert.Less(types.IndexOf(FeatureGeometricType.Surface), 0);
}
- [Test()]
+ [Test]
public void SpecificGeometryTypesTest()
{
var prop = new GeometricPropertyDefinition("Foo", "Bar");
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/MapDefinitionTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/MapDefinitionTests.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/MapDefinitionTests.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -1,27 +1,28 @@
-#region Disclaimer / License
-
-// Copyright (C) 2014, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
+#region Disclaimer / License
+
+// Copyright (C) 2014, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
#endregion Disclaimer / License
using NUnit.Framework;
using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.ObjectModels.Common;
using OSGeo.MapGuide.ObjectModels.MapDefinition;
using OSGeo.MapGuide.ObjectModels.TileSetDefinition;
using System;
@@ -35,6 +36,17 @@
public class MapDefinitionTests
{
[Test]
+ public void Envelope_Empty()
+ {
+ IEnvelope env = ObjectFactory.CreateEnvelope(0.0, 0.0, 0.0, 0.0);
+ Assert.True(env.IsEmpty());
+ env = null;
+ Assert.True(env.IsEmpty());
+ env = ObjectFactory.CreateEnvelope(-0.00000000001, -0.0000000000000001, 0.0000000000000000001, 0.000000000000001);
+ Assert.False(env.IsEmpty());
+ }
+
+ [Test]
public void CreateTest_V30()
{
var res = ObjectFactory.CreateMapDefinition(new Version(3, 0, 0), "TestMap");
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/ObjectFactoryTests.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/ObjectFactoryTests.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModel.Tests/ObjectFactoryTests.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -40,7 +40,7 @@
namespace OSGeo.MapGuide.ObjectModels.Tests
{
- [TestFixture()]
+ [TestFixture]
public class ObjectFactoryTests
{
[SetUp]
@@ -55,7 +55,7 @@
ObjectFactory.Reset();
}
- [Test()]
+ [Test]
public void RegisterResourceTest()
{
var ser = new Mock<ResourceSerializer>();
@@ -67,7 +67,7 @@
Assert.DoesNotThrow(() => ObjectFactory.RegisterResource(new ResourceTypeDescriptor("MyNewResourceType", "1.0.0"), ser.Object));
}
- [Test()]
+ [Test]
public void RegisterResourceSerializerTest()
{
Func<IResource, Stream> serFunc = (res) => null;
@@ -83,7 +83,7 @@
Assert.DoesNotThrow(() => ObjectFactory.RegisterResourceSerializer(new ResourceTypeDescriptor("MyNewResourceType", "1.0.0"), serFunc, deserFunc));
}
- [Test()]
+ [Test]
public void RegisterCompoundSymbolFactoryMethodTest()
{
Func<ICompoundSymbolDefinition> func = () => null;
@@ -95,7 +95,7 @@
Assert.DoesNotThrow(() => ObjectFactory.RegisterCompoundSymbolFactoryMethod(new Version(3, 0, 0), func));
}
- [Test()]
+ [Test]
public void RegisterSimpleSymbolFactoryMethodTest()
{
Func<ISimpleSymbolDefinition> func = () => null;
@@ -107,7 +107,7 @@
Assert.DoesNotThrow(() => ObjectFactory.RegisterSimpleSymbolFactoryMethod(new Version(3, 0, 0), func));
}
- [Test()]
+ [Test]
public void RegisterLayerFactoryMethodTest()
{
Func<LayerType, ILayerDefinition> func = (lt) => null;
@@ -119,7 +119,7 @@
Assert.DoesNotThrow(() => ObjectFactory.RegisterLayerFactoryMethod(new Version(3, 0, 0), func));
}
- [Test()]
+ [Test]
public void RegisterLoadProcedureFactoryMethodTest()
{
Func<ILoadProcedure> func = () => null;
@@ -129,7 +129,7 @@
}
}
- [Test()]
+ [Test]
public void RegisterWebLayoutFactoryMethodTest()
{
Func<string, IWebLayout> func = (mdfId) => null;
@@ -141,7 +141,7 @@
Assert.DoesNotThrow(() => ObjectFactory.RegisterWebLayoutFactoryMethod(new Version(3, 0, 0), func));
}
- [Test()]
+ [Test]
public void RegisterMapDefinitionFactoryMethodTest()
{
Func<IMapDefinition> func = () => null;
@@ -153,7 +153,7 @@
Assert.DoesNotThrow(() => ObjectFactory.RegisterMapDefinitionFactoryMethod(new Version(4, 0, 0), func));
}
- [Test()]
+ [Test]
public void RegisterWatermarkDefinitionFactoryMethodTest()
{
Func<SymbolDefinitionType, IWatermarkDefinition> func = (st) => null;
@@ -165,7 +165,7 @@
Assert.DoesNotThrow(() => ObjectFactory.RegisterWatermarkDefinitionFactoryMethod(new Version(4, 0, 0), func));
}
- [Test()]
+ [Test]
public void RegisterTileSetDefinitionFactoryMethodTest()
{
Func<ITileSetDefinition> func = () => null;
@@ -177,7 +177,7 @@
Assert.DoesNotThrow(() => ObjectFactory.RegisterTileSetDefinitionFactoryMethod(new Version(4, 0, 0), func));
}
- [Test()]
+ [Test]
public void CreateMetadataTest()
{
var meta = ObjectFactory.CreateMetadata();
@@ -186,7 +186,7 @@
Assert.AreEqual(0, meta.Simple.Property.Count);
}
- [Test()]
+ [Test]
public void CreateSecurityUserTest()
{
var user = ObjectFactory.CreateSecurityUser();
@@ -202,7 +202,7 @@
Assert.NotNull(group.Group);
}
- [Test()]
+ [Test]
public void CreateFeatureSourceExtensionTest()
{
var ext = ObjectFactory.CreateFeatureSourceExtension("Foo", "Bar");
@@ -214,7 +214,7 @@
Assert.AreEqual(0, ext.CalculatedProperty.Count());
}
- [Test()]
+ [Test]
public void CreateCalculatedPropertyTest()
{
var calc = ObjectFactory.CreateCalculatedProperty("Foo", "Bar");
@@ -222,7 +222,7 @@
Assert.AreEqual("Bar", calc.Expression);
}
- [Test()]
+ [Test]
public void CreateAttributeRelationTest()
{
var rel = ObjectFactory.CreateAttributeRelation();
@@ -232,7 +232,7 @@
Assert.AreEqual(0, rel.RelatePropertyCount);
}
- [Test()]
+ [Test]
public void CreateEnvelopeTest()
{
Assert.Throws<ArgumentException>(() => ObjectFactory.CreateEnvelope(.1, -.1, -.1, .1));
@@ -246,7 +246,7 @@
Assert.AreEqual(1, env.MaxY);
}
- [Test()]
+ [Test]
public void CreateDefaultLayerTest()
{
var versions = new Version[]
@@ -281,7 +281,7 @@
}
}
- [Test()]
+ [Test]
public void CreateDrawingSourceTest()
{
var ds = ObjectFactory.CreateDrawingSource();
@@ -292,7 +292,7 @@
Assert.IsNullOrEmpty(ds.CoordinateSpace);
}
- [Test()]
+ [Test]
public void CreateFeatureSourceTest()
{
var fs = ObjectFactory.CreateFeatureSource("OSGeo.SDF");
@@ -310,7 +310,7 @@
Assert.AreEqual(0, fs.ConnectionPropertyNames.Length);
}
- [Test()]
+ [Test]
public void CreateFeatureSourceTestWithParameters()
{
var param = new NameValueCollection();
@@ -338,7 +338,7 @@
Assert.NotNull(param2["ReadOnly"]);
}
- [Test()]
+ [Test]
public void CreateWatermarkTest()
{
var versions = new Version[]
@@ -360,7 +360,7 @@
}
}
- [Test()]
+ [Test]
public void CreateSymbolLibraryTest()
{
var lib = ObjectFactory.CreateSymbolLibrary();
@@ -369,7 +369,7 @@
Assert.AreEqual(0, lib.Symbol.Count());
}
- [Test()]
+ [Test]
public void CreateLoadProcedureTest()
{
foreach (LoadType lt in Enum.GetValues(typeof(LoadType)))
@@ -384,7 +384,7 @@
}
}
- [Test()]
+ [Test]
public void CreateLoadProcedureTestWithFileNames()
{
foreach (LoadType lt in Enum.GetValues(typeof(LoadType)))
@@ -406,7 +406,7 @@
}
}
- [Test()]
+ [Test]
public void CreateMapDefinitionTestWithName()
{
var versions = new Version[]
@@ -430,7 +430,7 @@
}
}
- [Test()]
+ [Test]
public void CreateMapDefinitionTestWithNameAndCoordSys()
{
var versions = new Version[]
@@ -454,7 +454,7 @@
}
}
- [Test()]
+ [Test]
public void CreateMapDefinitionTestWithNameAndCoordSysAndExtent()
{
var versions = new Version[]
@@ -483,7 +483,7 @@
}
}
- [Test()]
+ [Test]
public void CreateSimpleLabelTest()
{
var versions = new Version[]
@@ -510,7 +510,7 @@
}
}
- [Test()]
+ [Test]
public void CreateSimplePointTest()
{
var versions = new Version[]
@@ -530,7 +530,7 @@
}
}
- [Test()]
+ [Test]
public void CreateSimpleSolidLineTest()
{
var versions = new Version[]
@@ -550,7 +550,7 @@
}
}
- [Test()]
+ [Test]
public void CreateSimpleSolidFillTest()
{
var versions = new Version[]
@@ -570,7 +570,7 @@
}
}
- [Test()]
+ [Test]
public void CreateSimpleSymbolTest()
{
var versions = new Version[]
@@ -592,7 +592,7 @@
}
}
- [Test()]
+ [Test]
public void CreateCompoundSymbolTest()
{
var versions = new Version[]
@@ -616,7 +616,7 @@
}
}
- [Test()]
+ [Test]
public void CreatePrintLayoutTest()
{
var pl = ObjectFactory.CreatePrintLayout();
@@ -627,7 +627,7 @@
Assert.NotNull(pl.CustomText);
}
- [Test()]
+ [Test]
public void CreatePoint2DTest()
{
var pt = ObjectFactory.CreatePoint2D(1, 2);
@@ -635,7 +635,7 @@
Assert.AreEqual(2, pt.Y);
}
- [Test()]
+ [Test]
public void CreatePoint3DTest()
{
var pt = ObjectFactory.CreatePoint3D(1, 2, 3);
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/ApplicationDefinitionInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/ApplicationDefinitionInterfaces.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/ApplicationDefinitionInterfaces.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -1286,7 +1286,7 @@
/// <summary>
/// Defines the type of UI items
/// </summary>
- [System.SerializableAttribute()]
+ [System.SerializableAttribute]
public enum UiItemFunctionType
{
/// <remarks/>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ExtendedDataType.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ExtendedDataType.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ExtendedDataType.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -31,8 +31,8 @@
namespace OSGeo.MapGuide.ObjectModels.Common
{
[System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")] //NOXLATE
- [System.SerializableAttribute()]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.SerializableAttribute]
+ [System.Diagnostics.DebuggerStepThroughAttribute]
[System.ComponentModel.DesignerCategoryAttribute("code")] //NOXLATE
public partial class ExtendedDataType : System.ComponentModel.INotifyPropertyChanged
{
@@ -41,7 +41,7 @@
private static System.Xml.Serialization.XmlSerializer serializer;
- [System.Xml.Serialization.XmlAnyElementAttribute()]
+ [System.Xml.Serialization.XmlAnyElementAttribute]
public System.Xml.XmlElement[] Any
{
get
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IEnvelope.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IEnvelope.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IEnvelope.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -64,6 +64,20 @@
public static class EnvelopeExtensions
{
/// <summary>
+ /// Gets whether the given instance is empty
+ /// </summary>
+ /// <param name="env"></param>
+ /// <returns></returns>
+ public static bool IsEmpty(this IEnvelope env)
+ {
+ return env == null ||
+ (Math.Abs(env.MaxX) < double.Epsilon &&
+ Math.Abs(env.MaxY) < double.Epsilon &&
+ Math.Abs(env.MinX) < double.Epsilon &&
+ Math.Abs(env.MinY) < double.Epsilon);
+ }
+
+ /// <summary>
/// Gets the center of the specified envelope
/// </summary>
/// <param name="env"></param>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ResourceList.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ResourceList.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ResourceList.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -53,6 +53,7 @@
};
}
+
/// <summary>
/// For internal use only. Made public to satisfy serialization requirements. Use <see cref="M:OSGeo.MapGuide.ObjectModels.ResourceDocumentHeaderType.CreateDefault"/> to
/// create new instances
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/TileProviderList.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/TileProviderList.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/TileProviderList.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -1,23 +1,23 @@
-#region Disclaimer / License
-
-// Copyright (C) 2015, Jackie Ng
-// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
+#region Disclaimer / License
+
+// Copyright (C) 2015, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
#endregion Disclaimer / License
using System;
using System.Collections.Generic;
@@ -191,7 +191,7 @@
}
/// <remarks/>
- [System.Xml.Serialization.XmlAttributeAttribute()]
+ [System.Xml.Serialization.XmlAttributeAttribute]
public bool Enumerable
{
get
@@ -205,7 +205,7 @@
}
/// <remarks/>
- [System.Xml.Serialization.XmlAttributeAttribute()]
+ [System.Xml.Serialization.XmlAttributeAttribute]
public bool Protected
{
get
@@ -219,7 +219,7 @@
}
/// <remarks/>
- [System.Xml.Serialization.XmlAttributeAttribute()]
+ [System.Xml.Serialization.XmlAttributeAttribute]
public bool Required
{
get
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/FeatureSourceInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/FeatureSourceInterfaces.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/FeatureSourceInterfaces.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -245,7 +245,7 @@
/// <summary>
/// Defines the type of joins
/// </summary>
- [System.SerializableAttribute()]
+ [System.SerializableAttribute]
public enum RelateTypeEnum
{
/// <remarks/>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/LayerDefinitionInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/LayerDefinitionInterfaces.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/LayerDefinitionInterfaces.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -37,7 +37,7 @@
/// <summary>
/// The type of length unit
/// </summary>
- [System.SerializableAttribute()]
+ [Serializable]
public enum LengthUnitType
{
/// <remarks/>
@@ -71,7 +71,7 @@
/// <summary>
/// The type of size context
/// </summary>
- [System.SerializableAttribute()]
+ [Serializable]
public enum SizeContextType
{
/// <remarks/>
@@ -84,7 +84,7 @@
/// <summary>
/// The type of shape
/// </summary>
- [System.SerializableAttribute()]
+ [Serializable]
public enum ShapeType
{
/// <remarks/>
@@ -109,7 +109,7 @@
/// <summary>
/// The type of background style
/// </summary>
- [System.SerializableAttribute()]
+ [Serializable]
public enum BackgroundStyleType
{
/// <remarks/>
@@ -125,7 +125,7 @@
/// <summary>
/// The type of feature name
/// </summary>
- [System.SerializableAttribute()]
+ [Serializable]
public enum FeatureNameType
{
/// <remarks/>
@@ -138,7 +138,7 @@
/// <summary>
/// The type of explicit color
/// </summary>
- [System.SerializableAttribute()]
+ [Serializable]
[System.Xml.Serialization.XmlTypeAttribute(IncludeInSchema = false)]
public enum ItemChoiceType
{
@@ -1802,7 +1802,7 @@
/// <summary>
/// Type of elevation
/// </summary>
- [System.SerializableAttribute()]
+ [Serializable]
public enum ElevationTypeType
{
/// <remarks/>
@@ -2021,7 +2021,7 @@
/// <summary>
/// The types of usage context
/// </summary>
- [System.SerializableAttribute()]
+ [Serializable]
public enum UsageContextType
{
/// <remarks/>
@@ -2040,7 +2040,7 @@
/// <summary>
/// The types of geometry context
/// </summary>
- [System.SerializableAttribute()]
+ [Serializable]
public enum GeometryContextType
{
/// <remarks/>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/LoadProcedureInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/LoadProcedureInterfaces.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/LoadProcedureInterfaces.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -31,7 +31,7 @@
/// <summary>
/// Defines how to handle duplicate SDF2 keys (not supported by Maestro)
/// </summary>
- [System.SerializableAttribute()]
+ [Serializable]
public enum SdfKeyTreatmentType
{
/// <remarks/>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0/LoadProcedureImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0/LoadProcedureImpl.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0/LoadProcedureImpl.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -20,7 +20,6 @@
#endregion Disclaimer / License
-#define LP110
using System;
using System.Collections.Generic;
using System.Linq;
@@ -29,25 +28,11 @@
#pragma warning disable 1591, 0114, 0108
-#if LP110
-
namespace OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_1_0
-#elif LP220
-namespace OSGeo.MapGuide.ObjectModels.LoadProcedure.v2_2_0
-#else
-
-namespace OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_0_0
-#endif
{
partial class LoadProcedure : ILoadProcedure
{
-#if LP110
private static readonly Version RES_VERSION = new Version(1, 1, 0);
-#elif LP220
- private static readonly Version RES_VERSION = new Version(2, 2, 0);
-#else
- private static readonly Version RES_VERSION = new Version(1, 0, 0);
-#endif
private string _resId;
@@ -73,52 +58,25 @@
}
[XmlIgnore]
- public string ResourceType
- {
- get
- {
- return ResourceTypes.LoadProcedure.ToString();
- }
- }
+ public string ResourceType => ResourceTypes.LoadProcedure.ToString();
[XmlIgnore]
- public Version ResourceVersion
- {
- get
- {
- return RES_VERSION;
- }
- }
+ public Version ResourceVersion => RES_VERSION;
- object ICloneable.Clone()
- {
- return this.Clone();
- }
+ object ICloneable.Clone() => this.Clone();
[XmlAttribute("noNamespaceSchemaLocation", Namespace = "http://www.w3.org/2001/XMLSchema-instance")] //NOXLATE
public string ValidatingSchema
{
-#if LP110
get { return "LoadProcedure-1.1.0.xsd"; } //NOXLATE
-#elif LP220
- get { return "LoadProcedure-2.2.0.xsd"; } //NOXLATE
-#else
- get { return "LoadProcedure-1.0.0.xsd"; } //NOXLATE
-#endif
set { }
}
[XmlIgnore]
- public bool IsStronglyTyped
- {
- get { return true; }
- }
+ public bool IsStronglyTyped => true;
[XmlIgnore]
- IBaseLoadProcedure ILoadProcedure.SubType
- {
- get { return (IBaseLoadProcedure)this.Item; }
- }
+ IBaseLoadProcedure ILoadProcedure.SubType => this.Item;
}
abstract partial class LoadProcedureType : IBaseLoadProcedure
@@ -206,56 +164,30 @@
partial class SdfLoadProcedureType : ISdfLoadProcedure
{
[XmlIgnore]
- public override LoadType Type
- {
- get { return LoadType.Sdf; }
- }
+ public override LoadType Type => LoadType.Sdf;
}
partial class ShpLoadProcedureType : IShpLoadProcedure
{
[XmlIgnore]
- public override LoadType Type
- {
- get { return LoadType.Shp; }
- }
+ public override LoadType Type => LoadType.Shp;
}
partial class DwfLoadProcedureType : IDwfLoadProcedure
{
[XmlIgnore]
- public override LoadType Type
- {
- get { return LoadType.Dwf; }
- }
+ public override LoadType Type => LoadType.Dwf;
}
partial class DwgLoadProcedureType : IDwgLoadProcedure
{
[XmlIgnore]
- public override LoadType Type
- {
- get { return LoadType.Dwg; }
- }
+ public override LoadType Type => LoadType.Dwg;
}
partial class RasterLoadProcedureType : IRasterLoadProcedure
{
[XmlIgnore]
- public override LoadType Type
- {
- get { return LoadType.Raster; }
- }
+ public override LoadType Type => LoadType.Raster;
}
-
-#if LP220
- partial class SQLiteLoadProcedureType : ISqliteLoadProcedure
- {
- [XmlIgnore]
- public override LoadType Type
- {
- get { return LoadType.Sqlite; }
- }
- }
-#endif
}
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/MapDefinitionInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/MapDefinitionInterfaces.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/MapDefinitionInterfaces.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -323,15 +323,6 @@
/// </summary>
public static class MapDefinitionExtensions
{
- public static bool IsEmpty(this IEnvelope box2DType)
- {
- return box2DType == null ||
- (box2DType.MaxX == 0.0 &&
- box2DType.MaxY == 0.0 &&
- box2DType.MinX == 0.0 &&
- box2DType.MinY == 0.0);
- }
-
/// <summary>
/// Sets the extents of the map definition from the id of the the given layer definition
/// Does nothing if the extent is already set
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v1_0_0/MapDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v1_0_0/MapDefinitionImpl.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v1_0_0/MapDefinitionImpl.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -384,15 +384,6 @@
return layer;
}
- private static bool IsEmpty(Box2DType box2DType)
- {
- return box2DType == null ||
- (box2DType.MaxX == 0.0 &&
- box2DType.MaxY == 0.0 &&
- box2DType.MinX == 0.0 &&
- box2DType.MinY == 0.0);
- }
-
[XmlIgnore]
OSGeo.MapGuide.ObjectModels.Common.IEnvelope IMapDefinition.Extents
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_3_0/MapDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_3_0/MapDefinitionImpl.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_3_0/MapDefinitionImpl.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -384,16 +384,7 @@
return layer;
}
-
- private static bool IsEmpty(Box2DType box2DType)
- {
- return box2DType == null ||
- (box2DType.MaxX == 0.0 &&
- box2DType.MaxY == 0.0 &&
- box2DType.MinX == 0.0 &&
- box2DType.MinY == 0.0);
- }
-
+
[XmlIgnore]
OSGeo.MapGuide.ObjectModels.Common.IEnvelope IMapDefinition.Extents
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_4_0/MapDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_4_0/MapDefinitionImpl.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_4_0/MapDefinitionImpl.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -385,16 +385,7 @@
return layer;
}
-
- private static bool IsEmpty(Box2DType box2DType)
- {
- return box2DType == null ||
- (box2DType.MaxX == 0.0 &&
- box2DType.MaxY == 0.0 &&
- box2DType.MinX == 0.0 &&
- box2DType.MinY == 0.0);
- }
-
+
[XmlIgnore]
OSGeo.MapGuide.ObjectModels.Common.IEnvelope IMapDefinition.Extents
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0/MapDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0/MapDefinitionImpl.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0/MapDefinitionImpl.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -421,16 +421,7 @@
return layer;
}
-
- private static bool IsEmpty(Box2DType box2DType)
- {
- return box2DType == null ||
- (box2DType.MaxX == 0.0 &&
- box2DType.MaxY == 0.0 &&
- box2DType.MinX == 0.0 &&
- box2DType.MinY == 0.0);
- }
-
+
[XmlIgnore]
OSGeo.MapGuide.ObjectModels.Common.IEnvelope IMapDefinition.Extents
{
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceIdentifier.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceIdentifier.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceIdentifier.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -604,6 +604,7 @@
return GetParentFolder(identifier, false);
}
+
/// <summary>
/// Gets the parent folder.
/// </summary>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/SymbolDefinitionInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/SymbolDefinitionInterfaces.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/SymbolDefinitionInterfaces.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -600,7 +600,7 @@
/// Enumerates the allowed DataType values
/// </summary>
[System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
- [System.SerializableAttribute()]
+ [Serializable]
public enum DataType
{
/// <remarks/>
@@ -1438,7 +1438,7 @@
/// <summary>
/// Enumerates the allowed DataType values. Introduced with Symbol Definition 1.1.0 schema
/// </summary>
- [System.SerializableAttribute()]
+ [Serializable]
public enum DataType2
{
/// <remarks/>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_0_0/SymbolDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_0_0/SymbolDefinitionImpl.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_0_0/SymbolDefinitionImpl.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -841,7 +841,7 @@
{
if (typeof(ISimpleSymbolDefinition).IsAssignableFrom(this.Item.GetType()))
return SimpleSymbolReferenceType.Inline;
- else if (typeof(string) == this.Item.GetType())
+ else if (this.Item is string)
return SimpleSymbolReferenceType.Library;
}
return SimpleSymbolReferenceType.Undefined;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_1_0/SymbolDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_1_0/SymbolDefinitionImpl.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_1_0/SymbolDefinitionImpl.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -846,7 +846,7 @@
{
if (typeof(ISimpleSymbolDefinition).IsAssignableFrom(this.Item.GetType()))
return SimpleSymbolReferenceType.Inline;
- else if (typeof(string) == this.Item.GetType())
+ else if (this.Item is string)
return SimpleSymbolReferenceType.Library;
}
return SimpleSymbolReferenceType.Undefined;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v2_4_0/SymbolDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v2_4_0/SymbolDefinitionImpl.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v2_4_0/SymbolDefinitionImpl.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -847,7 +847,7 @@
{
if (typeof(ISimpleSymbolDefinition).IsAssignableFrom(this.Item.GetType()))
return SimpleSymbolReferenceType.Inline;
- else if (typeof(string) == this.Item.GetType())
+ else if (this.Item is string)
return SimpleSymbolReferenceType.Library;
}
return SimpleSymbolReferenceType.Undefined;
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/UntypedResource.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/UntypedResource.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/UntypedResource.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -52,10 +52,7 @@
/// <summary>
/// Gets the validating XML schema
/// </summary>
- public string ValidatingSchema
- {
- get { return this.ResourceType + "-" + this.ResourceVersion.ToString() + ".xsd"; } //NOXLATE
- }
+ public string ValidatingSchema => $"{this.ResourceType}-{this.ResourceVersion.ToString()}.xsd"; //NOXLATE
/// <summary>
/// Gets or sets the resource id
@@ -69,11 +66,7 @@
/// <summary>
/// Gets the resource type
/// </summary>
- public string ResourceType
- {
- get;
- private set;
- }
+ public string ResourceType { get; }
/// <summary>
/// Gets or sets the XML content
@@ -88,28 +81,18 @@
/// Gets the XML form of this instance
/// </summary>
/// <returns></returns>
- public string Serialize()
- {
- return this.XmlContent;
- }
+ public string Serialize() => this.XmlContent;
/// <summary>
/// Gets the resource version
/// </summary>
- public Version ResourceVersion
- {
- get;
- private set;
- }
+ public Version ResourceVersion { get; }
/// <summary>
/// Returns a clone of this instance
/// </summary>
/// <returns></returns>
- public object Clone()
- {
- return this.MemberwiseClone();
- }
+ public object Clone() => this.MemberwiseClone();
/// <summary>
/// Raised when a property changes
@@ -119,9 +102,6 @@
/// <summary>
/// Gets whether this resource is strongly typed
/// </summary>
- public bool IsStronglyTyped
- {
- get { return false; }
- }
+ public bool IsStronglyTyped => false;
}
}
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/WatermarkDefinitionInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/WatermarkDefinitionInterfaces.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/WatermarkDefinitionInterfaces.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -33,7 +33,7 @@
/// The allowed length units for a watermark position
/// </summary>
[System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.4.0.38968")] //NOXLATE
- [System.SerializableAttribute()]
+ [Serializable]
public enum UnitType
{
/// <remarks/>
@@ -56,7 +56,7 @@
/// The allowed horizontal alignment values for a watermark position
/// </summary>
[System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.4.0.38968")] //NOXLATE
- [System.SerializableAttribute()]
+ [Serializable]
public enum HorizontalAlignmentType
{
/// <remarks/>
@@ -73,7 +73,7 @@
/// The context in which the watermark is displayed
/// </summary>
[System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.4.0.38968")] //NOXLATE
- [System.SerializableAttribute()]
+ [Serializable]
public enum UsageType
{
/// <remarks/>
@@ -90,7 +90,7 @@
/// The allowed vertical alignments for a watermark position
/// </summary>
[System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.4.0.38968")] //NOXLATE
- [System.SerializableAttribute()]
+ [Serializable]
public enum VerticalAlignmentType
{
/// <remarks/>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_3_0/WatermarkDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_3_0/WatermarkDefinitionImpl.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_3_0/WatermarkDefinitionImpl.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -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/WebLayoutInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/WebLayoutInterfaces.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/WebLayoutInterfaces.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -198,7 +198,7 @@
/// <summary>
///
/// </summary>
- [System.SerializableAttribute()]
+ [Serializable]
public enum BasicCommandActionType
{
/// <remarks/>
@@ -271,7 +271,7 @@
/// <summary>
///
/// </summary>
- [System.SerializableAttribute()]
+ [Serializable]
public enum UIItemFunctionType
{
/// <remarks/>
@@ -287,7 +287,7 @@
/// <summary>
///
/// </summary>
- [System.SerializableAttribute()]
+ [Serializable]
public enum TargetType
{
/// <remarks/>
@@ -303,7 +303,7 @@
/// <summary>
///
/// </summary>
- [System.SerializableAttribute()]
+ [Serializable]
public enum TargetViewerType
{
/// <remarks/>
Modified: trunk/Tools/Maestro/Properties/CodeAnalysisRules.cs
===================================================================
--- trunk/Tools/Maestro/Properties/CodeAnalysisRules.cs 2015-08-11 15:11:47 UTC (rev 8738)
+++ trunk/Tools/Maestro/Properties/CodeAnalysisRules.cs 2015-08-11 16:22:58 UTC (rev 8739)
@@ -31,4 +31,15 @@
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Nullable type can be simplified", "RECS0013")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Replace with '|='", "RECS0033", Justification = "The author prefers clarity of code")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Replace with '&='", "RECS0093", Justification = "The author prefers clarity of code")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Not implemented", "RECS0083", Justification = "A NotImplementedException is thrown for a reason")]
\ No newline at end of file
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Not implemented", "RECS0083", Justification = "A NotImplementedException is thrown for a reason")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Potential Code Quality Issues", "RECS0029", Justification = "Needed to satisfy an XML serialization contract")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancies in Symbol Declarations", "RECS0001", Justification = "Other parts may exist in the future")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancies in Code", "RECS0071", Justification = "This is just plain pedantry")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancies in Code", "RECS0138", Justification = "The author prefers to be explicit")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancies in Symbol Declarations", "RECS0004", Justification = "If one is specified, it's to satisfy an XML serialization contract")]
+
+//TODO: Review these ones as we get further clarity about what string comparisons should be culture-sensitive and which ones shouldn't be
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Common Practices and Code Improvements", "RECS0060", Justification = "To be reviewed at a later time")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Common Practices and Code Improvements", "RECS0061", Justification = "To be reviewed at a later time")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Common Practices and Code Improvements", "RECS0062", Justification = "To be reviewed at a later time")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Common Practices and Code Improvements", "RECS0063", Justification = "To be reviewed at a later time")]
\ No newline at end of file
More information about the mapguide-commits
mailing list