Index: Core/Components/src/Core.Components.DotSpatial/Converter/IMapDataConverter.cs =================================================================== diff -u -rf816b467d3aae059a7728645575ec2eabfbcb0f7 -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/src/Core.Components.DotSpatial/Converter/IMapDataConverter.cs (.../IMapDataConverter.cs) (revision f816b467d3aae059a7728645575ec2eabfbcb0f7) +++ Core/Components/src/Core.Components.DotSpatial/Converter/IMapDataConverter.cs (.../IMapDataConverter.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -48,4 +48,4 @@ /// Thrown when is null. IList Convert(MapData data); } -} +} \ No newline at end of file Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapDataCollectionConverter.cs =================================================================== diff -u -rf816b467d3aae059a7728645575ec2eabfbcb0f7 -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/src/Core.Components.DotSpatial/Converter/MapDataCollectionConverter.cs (.../MapDataCollectionConverter.cs) (revision f816b467d3aae059a7728645575ec2eabfbcb0f7) +++ Core/Components/src/Core.Components.DotSpatial/Converter/MapDataCollectionConverter.cs (.../MapDataCollectionConverter.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -38,4 +38,4 @@ return data.List.SelectMany(md => factory.Create(md)).ToList(); } } -} +} \ No newline at end of file Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs =================================================================== diff -u -r3760b6241dca4d9439e23cecb69c79fc019e6250 -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs (.../MapDataConverter.cs) (revision 3760b6241dca4d9439e23cecb69c79fc019e6250) +++ Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs (.../MapDataConverter.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -58,4 +58,4 @@ /// A new of . protected abstract IList Convert(T data); } -} +} \ No newline at end of file Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapDataFactory.cs =================================================================== diff -u -rf816b467d3aae059a7728645575ec2eabfbcb0f7 -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/src/Core.Components.DotSpatial/Converter/MapDataFactory.cs (.../MapDataFactory.cs) (revision f816b467d3aae059a7728645575ec2eabfbcb0f7) +++ Core/Components/src/Core.Components.DotSpatial/Converter/MapDataFactory.cs (.../MapDataFactory.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -62,4 +62,4 @@ throw new NotSupportedException(string.Format("MapData of type {0} is not supported.", data.GetType().Name)); } } -} +} \ No newline at end of file Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs =================================================================== diff -u -r7cb5faabd65fb50c17f40c75b76fbd17714cca82 -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs (.../MapLineDataConverter.cs) (revision 7cb5faabd65fb50c17f40c75b76fbd17714cca82) +++ Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs (.../MapLineDataConverter.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -46,4 +46,4 @@ }; } } -} +} \ No newline at end of file Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs =================================================================== diff -u -r7cb5faabd65fb50c17f40c75b76fbd17714cca82 -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs (.../MapPointDataConverter.cs) (revision 7cb5faabd65fb50c17f40c75b76fbd17714cca82) +++ Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs (.../MapPointDataConverter.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -40,7 +40,10 @@ featureSet.Features.Add(new Coordinate(point.Item1, point.Item2)); } - return new List { featureSet }; + return new List + { + featureSet + }; } } } \ No newline at end of file Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs =================================================================== diff -u -r7cb5faabd65fb50c17f40c75b76fbd17714cca82 -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs (.../MapPolygonDataConverter.cs) (revision 7cb5faabd65fb50c17f40c75b76fbd17714cca82) +++ Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs (.../MapPolygonDataConverter.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -46,4 +46,4 @@ }; } } -} +} \ No newline at end of file Index: Core/Components/src/Core.Components.DotSpatial/Data/MapData.cs =================================================================== diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/src/Core.Components.DotSpatial/Data/MapData.cs (.../MapData.cs) (revision 4512af7782ee31b36941bb280b54d9da2953dd71) +++ Core/Components/src/Core.Components.DotSpatial/Data/MapData.cs (.../MapData.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -24,5 +24,5 @@ /// /// Abstract class for data with the purpose of becoming visible in map components. /// - public abstract class MapData { } + public abstract class MapData {} } \ No newline at end of file Index: Core/Components/src/Core.Components.DotSpatial/Data/MapDataCollection.cs =================================================================== diff -u -r0696ce6625da3aa9b4b2df7f062caa7570a7675c -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/src/Core.Components.DotSpatial/Data/MapDataCollection.cs (.../MapDataCollection.cs) (revision 0696ce6625da3aa9b4b2df7f062caa7570a7675c) +++ Core/Components/src/Core.Components.DotSpatial/Data/MapDataCollection.cs (.../MapDataCollection.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -46,6 +46,6 @@ /// /// Gets the list of of the . /// - public IList List { get; private set; } + public IList List { get; private set; } } -} +} \ No newline at end of file Index: Core/Components/src/Core.Components.DotSpatial/Data/MapLineData.cs =================================================================== diff -u -r0696ce6625da3aa9b4b2df7f062caa7570a7675c -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/src/Core.Components.DotSpatial/Data/MapLineData.cs (.../MapLineData.cs) (revision 0696ce6625da3aa9b4b2df7f062caa7570a7675c) +++ Core/Components/src/Core.Components.DotSpatial/Data/MapLineData.cs (.../MapLineData.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -36,4 +36,4 @@ /// Thrown when is null. public MapLineData(IEnumerable> points) : base(points) {} } -} +} \ No newline at end of file Index: Core/Components/src/Core.Components.DotSpatial/Data/MapPointData.cs =================================================================== diff -u -r0696ce6625da3aa9b4b2df7f062caa7570a7675c -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/src/Core.Components.DotSpatial/Data/MapPointData.cs (.../MapPointData.cs) (revision 0696ce6625da3aa9b4b2df7f062caa7570a7675c) +++ Core/Components/src/Core.Components.DotSpatial/Data/MapPointData.cs (.../MapPointData.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -36,4 +36,4 @@ /// Thrown when is null. public MapPointData(IEnumerable> points) : base(points) {} } -} +} \ No newline at end of file Index: Core/Components/src/Core.Components.DotSpatial/Data/MapPolygonData.cs =================================================================== diff -u -r0696ce6625da3aa9b4b2df7f062caa7570a7675c -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/src/Core.Components.DotSpatial/Data/MapPolygonData.cs (.../MapPolygonData.cs) (revision 0696ce6625da3aa9b4b2df7f062caa7570a7675c) +++ Core/Components/src/Core.Components.DotSpatial/Data/MapPolygonData.cs (.../MapPolygonData.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -36,4 +36,4 @@ /// Thrown when is null. public MapPolygonData(IEnumerable> points) : base(points) {} } -} +} \ No newline at end of file Index: Core/Components/src/Core.Components.DotSpatial/Properties/AssemblyInfo.cs =================================================================== diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/src/Core.Components.DotSpatial/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 4512af7782ee31b36941bb280b54d9da2953dd71) +++ Core/Components/src/Core.Components.DotSpatial/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -21,6 +21,7 @@ using System.Reflection; using System.Runtime.InteropServices; + [assembly: AssemblyTitle("Core.Components.DotSpatial")] [assembly: AssemblyProduct("Core.Components.DotSpatial")] [assembly: Guid("AA47E858-A2A7-470E-8B2D-C76AE8ED9CCD")] \ No newline at end of file Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataCollectionConverterTest.cs =================================================================== diff -u -r80a4afe88db94aaaa16ab83bedb51b05be62b31d -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataCollectionConverterTest.cs (.../MapDataCollectionConverterTest.cs) (revision 80a4afe88db94aaaa16ab83bedb51b05be62b31d) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataCollectionConverterTest.cs (.../MapDataCollectionConverterTest.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -118,4 +118,4 @@ Assert.AreEqual(FeatureType.Line, featureSets[1].FeatureType); } } -} +} \ No newline at end of file Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataConverterTest.cs =================================================================== diff -u -r837d8618f4ce8a36447422da4de880e8d1aca8fb -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataConverterTest.cs (.../MapDataConverterTest.cs) (revision 837d8618f4ce8a36447422da4de880e8d1aca8fb) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataConverterTest.cs (.../MapDataConverterTest.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -91,4 +91,4 @@ } } } -} +} \ No newline at end of file Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataFactoryTest.cs =================================================================== diff -u -r643e836dcc53ee9a1a20e2c5c150460d12a8ad6c -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataFactoryTest.cs (.../MapDataFactoryTest.cs) (revision 643e836dcc53ee9a1a20e2c5c150460d12a8ad6c) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataFactoryTest.cs (.../MapDataFactoryTest.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -43,7 +43,7 @@ IList featureSets = factory.Create(new MapLineData(testData)); // Assert - Assert.IsInstanceOf> (featureSets); + Assert.IsInstanceOf>(featureSets); var featureSet = featureSets[0]; Assert.AreEqual(1, featureSet.Features.Count); Assert.IsInstanceOf(featureSet); @@ -62,7 +62,7 @@ IList featureSets = factory.Create(new MapPolygonData(testData)); // Assert - Assert.IsInstanceOf> (featureSets); + Assert.IsInstanceOf>(featureSets); var featureSet = featureSets[0]; Assert.AreEqual(1, featureSet.Features.Count); Assert.IsInstanceOf(featureSet); @@ -123,7 +123,7 @@ Assert.Throws(test); } - private static Collection> CreateTestData() + private static Collection> CreateTestData() { return new Collection> { @@ -133,4 +133,4 @@ }; } } -} +} \ No newline at end of file Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs =================================================================== diff -u -r80a4afe88db94aaaa16ab83bedb51b05be62b31d -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs (.../MapPointDataConverterTest.cs) (revision 80a4afe88db94aaaa16ab83bedb51b05be62b31d) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs (.../MapPointDataConverterTest.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -113,4 +113,4 @@ TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); } } -} +} \ No newline at end of file Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs =================================================================== diff -u -r80a4afe88db94aaaa16ab83bedb51b05be62b31d -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs (.../MapPolygonDataConverterTest.cs) (revision 80a4afe88db94aaaa16ab83bedb51b05be62b31d) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs (.../MapPolygonDataConverterTest.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -113,4 +113,4 @@ TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); } } -} +} \ No newline at end of file Index: Core/Components/test/Core.Components.DotSpatial.Test/Data/MapDataCollectionTest.cs =================================================================== diff -u -r643e836dcc53ee9a1a20e2c5c150460d12a8ad6c -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/test/Core.Components.DotSpatial.Test/Data/MapDataCollectionTest.cs (.../MapDataCollectionTest.cs) (revision 643e836dcc53ee9a1a20e2c5c150460d12a8ad6c) +++ Core/Components/test/Core.Components.DotSpatial.Test/Data/MapDataCollectionTest.cs (.../MapDataCollectionTest.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -35,4 +35,4 @@ Assert.AreSame(list, collection.List); } } -} +} \ No newline at end of file Index: Core/Components/test/Core.Components.DotSpatial.Test/Data/MapLineDataTest.cs =================================================================== diff -u -r643e836dcc53ee9a1a20e2c5c150460d12a8ad6c -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/test/Core.Components.DotSpatial.Test/Data/MapLineDataTest.cs (.../MapLineDataTest.cs) (revision 643e836dcc53ee9a1a20e2c5c150460d12a8ad6c) +++ Core/Components/test/Core.Components.DotSpatial.Test/Data/MapLineDataTest.cs (.../MapLineDataTest.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -54,10 +54,10 @@ { return new Collection> { - new Tuple(0.0, 1.1), + new Tuple(0.0, 1.1), new Tuple(1.0, 2.1), - new Tuple(1.6, 1.6) + new Tuple(1.6, 1.6) }; } } -} +} \ No newline at end of file Index: Core/Components/test/Core.Components.DotSpatial.Test/Data/MapPointDataTest.cs =================================================================== diff -u -r643e836dcc53ee9a1a20e2c5c150460d12a8ad6c -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/test/Core.Components.DotSpatial.Test/Data/MapPointDataTest.cs (.../MapPointDataTest.cs) (revision 643e836dcc53ee9a1a20e2c5c150460d12a8ad6c) +++ Core/Components/test/Core.Components.DotSpatial.Test/Data/MapPointDataTest.cs (.../MapPointDataTest.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -54,10 +54,10 @@ { return new Collection> { - new Tuple(0.0, 1.1), + new Tuple(0.0, 1.1), new Tuple(1.0, 2.1), - new Tuple(1.6, 1.6) + new Tuple(1.6, 1.6) }; } } -} +} \ No newline at end of file Index: Core/Components/test/Core.Components.DotSpatial.Test/Data/MapPolygonDataTest.cs =================================================================== diff -u -r643e836dcc53ee9a1a20e2c5c150460d12a8ad6c -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/test/Core.Components.DotSpatial.Test/Data/MapPolygonDataTest.cs (.../MapPolygonDataTest.cs) (revision 643e836dcc53ee9a1a20e2c5c150460d12a8ad6c) +++ Core/Components/test/Core.Components.DotSpatial.Test/Data/MapPolygonDataTest.cs (.../MapPolygonDataTest.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -54,9 +54,9 @@ { return new Collection> { - new Tuple(0.0, 1.1), + new Tuple(0.0, 1.1), new Tuple(1.0, 2.1), - new Tuple(1.6, 1.6) + new Tuple(1.6, 1.6) }; } } Index: Core/Components/test/Core.Components.DotSpatial.Test/Data/PointsBasedMapDataTest.cs =================================================================== diff -u -rd841739a41fc898c60822e80e67f351b8e68f794 -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/test/Core.Components.DotSpatial.Test/Data/PointsBasedMapDataTest.cs (.../PointsBasedMapDataTest.cs) (revision d841739a41fc898c60822e80e67f351b8e68f794) +++ Core/Components/test/Core.Components.DotSpatial.Test/Data/PointsBasedMapDataTest.cs (.../PointsBasedMapDataTest.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -42,7 +42,7 @@ private class TestPointBasedMapData : PointBasedMapData { - public TestPointBasedMapData(IEnumerable> points) : base(points) { } + public TestPointBasedMapData(IEnumerable> points) : base(points) {} } } -} +} \ No newline at end of file Index: Core/Components/test/Core.Components.DotSpatial.Test/Properties/AssemblyInfo.cs =================================================================== diff -u -racc9000ab9514b5adcab4bdeb8daebef8b9b7a29 -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/test/Core.Components.DotSpatial.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision acc9000ab9514b5adcab4bdeb8daebef8b9b7a29) +++ Core/Components/test/Core.Components.DotSpatial.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -7,7 +7,8 @@ // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. + [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("DD7ECAFF-D8A1-4D92-99C0-27498ACB32D4")] +[assembly: Guid("DD7ECAFF-D8A1-4D92-99C0-27498ACB32D4")] \ No newline at end of file Index: Core/Components/test/Core.Components.DotSpatial.TestUtil/Properties/AssemblyInfo.cs =================================================================== diff -u -r97ecd934817b9e808038f056dc5ae0a7db3455ee -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/test/Core.Components.DotSpatial.TestUtil/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 97ecd934817b9e808038f056dc5ae0a7db3455ee) +++ Core/Components/test/Core.Components.DotSpatial.TestUtil/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -7,6 +7,7 @@ // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. + [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM Index: Core/Components/test/Core.Components.DotSpatial.TestUtil/TestMapData.cs =================================================================== diff -u -r97ecd934817b9e808038f056dc5ae0a7db3455ee -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Components/test/Core.Components.DotSpatial.TestUtil/TestMapData.cs (.../TestMapData.cs) (revision 97ecd934817b9e808038f056dc5ae0a7db3455ee) +++ Core/Components/test/Core.Components.DotSpatial.TestUtil/TestMapData.cs (.../TestMapData.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -5,7 +5,5 @@ /// /// A class representing a implementation which is not in the regular codebase. /// - public class TestMapData : MapData - { - } -} + public class TestMapData : MapData {} +} \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendController.cs =================================================================== diff -u -r6a644d66b282d1c0cb1625cf2322f1e67148556d -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendController.cs (.../MapLegendController.cs) (revision 6a644d66b282d1c0cb1625cf2322f1e67148556d) +++ Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendController.cs (.../MapLegendController.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -32,9 +32,9 @@ public class MapLegendController { private readonly IToolViewController toolViewController; - private IView legendView; public EventHandler OnOpenLegend; + private IView legendView; /// /// Creates a new instance of . @@ -74,6 +74,19 @@ } /// + /// Updates the data for the if it is open. + /// + /// The to show. If null the + /// data will be cleared. + public void Update(MapData data) + { + if (IsLegendViewOpen()) + { + legendView.Data = data; + } + } + + /// /// Open the . /// private void OpenLegendView() @@ -95,18 +108,5 @@ legendView.Dispose(); legendView = null; } - - /// - /// Updates the data for the if it is open. - /// - /// The to show. If null the - /// data will be cleared. - public void Update(MapData data) - { - if (IsLegendViewOpen()) - { - legendView.Data = data; - } - } } -} +} \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendView.cs =================================================================== diff -u -r6a644d66b282d1c0cb1625cf2322f1e67148556d -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendView.cs (.../MapLegendView.cs) (revision 6a644d66b282d1c0cb1625cf2322f1e67148556d) +++ Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendView.cs (.../MapLegendView.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -25,8 +25,6 @@ using Core.Common.Controls.Views; using Core.Components.DotSpatial; using Core.Components.DotSpatial.Data; -using Core.Plugins.DotSpatial.Properties; - using DotSpatialResources = Core.Plugins.DotSpatial.Properties.Resources; using GuiResources = Core.Common.Gui.Properties.Resources; @@ -45,7 +43,7 @@ public MapLegendView() { InitializeComponent(); - Text = Resources.General_Map; + Text = DotSpatialResources.General_Map; treeViewControl = new TreeViewControl { @@ -56,20 +54,37 @@ RegisterTreeNodeInfos(); } + public object Data + { + get + { + return (MapData) treeViewControl.Data; + } + set + { + if (IsDisposed) + { + return; + } + + treeViewControl.Data = (MapData) value; + } + } + private void RegisterTreeNodeInfos() { treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo { Text = mapPointData => DotSpatialResources.MapDataNodePresenter_Point_data_label, Image = mapPointData => DotSpatialResources.PointsIcon }); - + treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo { Text = mapLineData => DotSpatialResources.MapDataNodePresenter_Line_data_label, Image = mapLineData => DotSpatialResources.LineIcon }); - + treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo { Text = mapPolygonData => DotSpatialResources.MapDataNodePresenter_Polygon_data_label, @@ -83,22 +98,5 @@ ChildNodeObjects = mapDataCollection => mapDataCollection.List.Reverse().Cast().ToArray() }); } - - public object Data - { - get - { - return (MapData) treeViewControl.Data; - } - set - { - if (IsDisposed) - { - return; - } - - treeViewControl.Data = (MapData) value; - } - } } } \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.DotSpatial/Properties/AssemblyInfo.cs =================================================================== diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Plugins/src/Core.Plugins.DotSpatial/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 4512af7782ee31b36941bb280b54d9da2953dd71) +++ Core/Plugins/src/Core.Plugins.DotSpatial/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -21,6 +21,7 @@ using System.Reflection; using System.Runtime.InteropServices; + [assembly: AssemblyTitle("Core.Plugins.DotSpatial")] [assembly: AssemblyProduct("Core.Plugins.DotSpatial")] [assembly: Guid("610E0A9C-1997-4C43-A10E-39D4C66ADA93")] \ No newline at end of file Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Commands/ToggleMapLegendViewCommandTest.cs =================================================================== diff -u -r22cb2d9d1401e7c89e608f1f03f319d583648e38 -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Commands/ToggleMapLegendViewCommandTest.cs (.../ToggleMapLegendViewCommandTest.cs) (revision 22cb2d9d1401e7c89e608f1f03f319d583648e38) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Commands/ToggleMapLegendViewCommandTest.cs (.../ToggleMapLegendViewCommandTest.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -83,4 +83,4 @@ mocks.VerifyAll(); } } -} +} \ No newline at end of file Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/DotSpatialGuiPluginTest.cs =================================================================== diff -u -r22cb2d9d1401e7c89e608f1f03f319d583648e38 -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/DotSpatialGuiPluginTest.cs (.../DotSpatialGuiPluginTest.cs) (revision 22cb2d9d1401e7c89e608f1f03f319d583648e38) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/DotSpatialGuiPluginTest.cs (.../DotSpatialGuiPluginTest.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -1,15 +1,13 @@ using System; using System.Linq; using System.Windows; - using Core.Common.Base.Plugin; using Core.Common.Base.Storage; using Core.Common.Controls.Views; using Core.Common.Gui; using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.Gui.Settings; -using Core.Common.Test.TestObjects; using Core.Components.DotSpatial; using Core.Components.DotSpatial.Data; using Core.Components.DotSpatial.TestUtil; @@ -103,7 +101,7 @@ [Test] public void GetViewInfoObjects_Always_ReturnsMapDataViewInfo() { - // Setup + // Setup using (var plugin = new DotSpatialGuiPlugin()) { var view = new MapDataView(); Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Forms/MapDataViewTest.cs =================================================================== diff -u -rf665ce5f69f43f2ee4a96a05e44b849d019bb53a -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Forms/MapDataViewTest.cs (.../MapDataViewTest.cs) (revision f665ce5f69f43f2ee4a96a05e44b849d019bb53a) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Forms/MapDataViewTest.cs (.../MapDataViewTest.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -44,7 +44,7 @@ { // Setup var mapView = new MapDataView(); - var map = (BaseMap)mapView.Controls[0]; + var map = (BaseMap) mapView.Controls[0]; // Call TestDelegate testDelegate = () => mapView.Data = null; @@ -72,7 +72,7 @@ { // Setup var mapView = new MapDataView(); - var map = (BaseMap)mapView.Controls[0]; + var map = (BaseMap) mapView.Controls[0]; var pointData = new MapPointData(Enumerable.Empty>()); // Call Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs =================================================================== diff -u -rdc440129817a321f76c348235e4967d7166f7a2b -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs (.../MapDataCollectionTreeNodeInfoTest.cs) (revision dc440129817a321f76c348235e4967d7166f7a2b) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs (.../MapDataCollectionTreeNodeInfoTest.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -92,9 +92,14 @@ var objects = info.ChildNodeObjects(mapDataCollection); // Assert - CollectionAssert.AreEqual(new[] { mapData3, mapData2, mapData1 }, objects); + CollectionAssert.AreEqual(new[] + { + mapData3, + mapData2, + mapData1 + }, objects); mocks.VerifyAll(); } } -} +} \ No newline at end of file Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapLineDataTreeNodeInfoTest.cs =================================================================== diff -u -rdc440129817a321f76c348235e4967d7166f7a2b -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapLineDataTreeNodeInfoTest.cs (.../MapLineDataTreeNodeInfoTest.cs) (revision dc440129817a321f76c348235e4967d7166f7a2b) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapLineDataTreeNodeInfoTest.cs (.../MapLineDataTreeNodeInfoTest.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -6,7 +6,6 @@ using Core.Components.DotSpatial.Data; using Core.Plugins.DotSpatial.Legend; using NUnit.Framework; - using DotSpatialResources = Core.Plugins.DotSpatial.Properties.Resources; namespace Core.Plugins.DotSpatial.Test.Legend @@ -70,4 +69,4 @@ TestHelper.AssertImagesAreEqual(DotSpatialResources.LineIcon, image); } } -} +} \ No newline at end of file Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPointDataTreeNodeInfoTest.cs =================================================================== diff -u -rdc440129817a321f76c348235e4967d7166f7a2b -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPointDataTreeNodeInfoTest.cs (.../MapPointDataTreeNodeInfoTest.cs) (revision dc440129817a321f76c348235e4967d7166f7a2b) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPointDataTreeNodeInfoTest.cs (.../MapPointDataTreeNodeInfoTest.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -69,4 +69,4 @@ TestHelper.AssertImagesAreEqual(DotSpatialResources.PointsIcon, image); } } -} +} \ No newline at end of file Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPolygonDataTreeNodeInfoTest.cs =================================================================== diff -u -rdc440129817a321f76c348235e4967d7166f7a2b -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPolygonDataTreeNodeInfoTest.cs (.../MapPolygonDataTreeNodeInfoTest.cs) (revision dc440129817a321f76c348235e4967d7166f7a2b) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapPolygonDataTreeNodeInfoTest.cs (.../MapPolygonDataTreeNodeInfoTest.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -6,7 +6,6 @@ using Core.Components.DotSpatial.Data; using Core.Plugins.DotSpatial.Legend; using NUnit.Framework; - using DotSpatialResources = Core.Plugins.DotSpatial.Properties.Resources; namespace Core.Plugins.DotSpatial.Test.Legend @@ -70,4 +69,4 @@ TestHelper.AssertImagesAreEqual(DotSpatialResources.AreaIcon, image); } } -} +} \ No newline at end of file Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/MapRibbonTest.cs =================================================================== diff -u -rf2859c13f845d1cb1f654022aad4f48cdb5d908b -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/MapRibbonTest.cs (.../MapRibbonTest.cs) (revision f2859c13f845d1cb1f654022aad4f48cdb5d908b) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/MapRibbonTest.cs (.../MapRibbonTest.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -59,7 +59,10 @@ var commands = ribbon.Commands.ToArray(); // Assert - CollectionAssert.AreEqual(new ICommand[] { toggleLegendViewCommand }, commands); + CollectionAssert.AreEqual(new ICommand[] + { + toggleLegendViewCommand + }, commands); mocks.VerifyAll(); } @@ -158,4 +161,4 @@ mocks.VerifyAll(); } } -} +} \ No newline at end of file Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Properties/AssemblyInfo.cs =================================================================== diff -u -racc9000ab9514b5adcab4bdeb8daebef8b9b7a29 -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision acc9000ab9514b5adcab4bdeb8daebef8b9b7a29) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -1,5 +1,6 @@ using System.Reflection; using System.Runtime.InteropServices; + [assembly: AssemblyTitle("Core.Plugins.DotSpatial.Test")] [assembly: AssemblyProduct("Core.Plugins.DotSpatial.Test")] [assembly: Guid("93AB5AFB-F58E-4EC4-A25E-FF439B1895E7")] \ No newline at end of file Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestMapView.cs =================================================================== diff -u -r47324919290e03ed6e8147f85e67024c16e602a8 -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestMapView.cs (.../TestMapView.cs) (revision 47324919290e03ed6e8147f85e67024c16e602a8) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestMapView.cs (.../TestMapView.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -19,4 +19,4 @@ } } } -} +} \ No newline at end of file Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestView.Designer.cs =================================================================== diff -u -rd212065881d696420fd33c789c917501e09c7fc0 -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestView.Designer.cs (.../TestView.Designer.cs) (revision d212065881d696420fd33c789c917501e09c7fc0) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestView.Designer.cs (.../TestView.Designer.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -1,4 +1,4 @@ -namespace Core.Common.Test.TestObjects +namespace Core.Plugins.DotSpatial.Test { partial class TestView { @@ -28,29 +28,18 @@ /// private void InitializeComponent() { - this.textBox1 = new System.Windows.Forms.TextBox(); this.SuspendLayout(); // - // textBox1 - // - this.textBox1.Location = new System.Drawing.Point(3, 3); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(74, 20); - this.textBox1.TabIndex = 0; - // // TestView // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.textBox1); this.Name = "TestView"; this.ResumeLayout(false); - this.PerformLayout(); } #endregion - private System.Windows.Forms.TextBox textBox1; } } Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestView.cs =================================================================== diff -u -rd212065881d696420fd33c789c917501e09c7fc0 -r5c3f702f76f617808344416749d1ec1cfb104559 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestView.cs (.../TestView.cs) (revision d212065881d696420fd33c789c917501e09c7fc0) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestView.cs (.../TestView.cs) (revision 5c3f702f76f617808344416749d1ec1cfb104559) @@ -1,7 +1,7 @@ using System.Windows.Forms; using Core.Common.Controls.Views; -namespace Core.Common.Test.TestObjects +namespace Core.Plugins.DotSpatial.Test { public partial class TestView : UserControl, IView { @@ -12,11 +12,4 @@ public object Data { get; set; } } - - public class TestViewDerivative : TestView {} - - public class TestWrapper - { - public string RealData { get; set; } - } } \ No newline at end of file