[mapguide-commits] r8459 - in trunk: MgDev/UnitTest/TestData/DrawingService MgDev/UnitTest/TestData/MappingService MgDev/UnitTest/TestData/PrintLayout MgDev/UnitTest/TestData/ResourceService MgDev/UnitTest/TestData/Symbology MgDev/UnitTest/TestData/TileService MgDev/UnitTest/TestData/Wfs MgDev/UnitTest/TestData/Wms Tools/Maestro Tools/Maestro/LocalConfigure Tools/Maestro/LocalConfigure/Properties Tools/Maestro/Maestro Tools/Maestro/Maestro/Data/TipOfTheDay Tools/Maestro/Maestro/Properties Tools/Maestro/Maestro/packages Tools/Maestro/Maestro.AddIn.ExtendedObjectModels Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Commands Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Editor Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates Tools/Maestro/Maestro.AddIn.FdoToolbox Tools/Maestro/Maestro.AddIn.FdoToolbox/Commands Tools/Maestro/Maestro.AddIn.FdoToolbox/Properties Tools/Maestro/Maestro.AddIn.Local Tools/Maestro/Maestro. AddIn.Local/Commands Tools/Maestro/Maestro.AddIn.Local/Properties Tools/Maestro/Maestro.AddIn.Local/Services Tools/Maestro/Maestro.AddIn.Local/UI Tools/Maestro/Maestro.AddIn.Scripting Tools/Maestro/Maestro.AddIn.Scripting/Commands Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python Tools/Maestro/Maestro.AddIn.Scripting/Properties Tools/Maestro/Maestro.AddIn.Scripting/Services Tools/Maestro/Maestro.AddIn.Scripting/UI Tools/Maestro/Maestro.AddInManager Tools/Maestro/Maestro.AddInManager/Properties Tools/Maestro/Maestro.Base Tools/Maestro/Maestro.Base/Commands Tools/Maestro/Maestro.Base/Commands/Conditions Tools/Maestro/Maestro.Base/Commands/SiteExplorer Tools/Maestro/Maestro.Base/Commands/Test Tools/Maestro/Maestro.Base/Editor Tools/Maestro/Maestro.Base/Events Tools/Maestro/Maestro.Base/Properties Tools/Maestro/Maestro.Base/Services Tools/Maestro/Maestro.Base/Services/DragDropHandlers Tools/Maestro/Maestro.Base/Templates Tools/Maestro/Maestro.Base/UI Tools/Maestro/Maestro.Base/U I/Packaging Tools/Maestro/Maestro.Base/UI/Preferences Tools/Maestro/Maestro.Editors Tools/Maestro/Maestro.Editors/Common Tools/Maestro/Maestro.Editors/Common/Expression Tools/Maestro/Maestro.Editors/Diagnostics Tools/Maestro/Maestro.Editors/Diff Tools/Maestro/Maestro.Editors/DrawingSource Tools/Maestro/Maestro.Editors/FeatureSource Tools/Maestro/Maestro.Editors/FeatureSource/CoordSys Tools/Maestro/Maestro.Editors/FeatureSource/Extensions Tools/Maestro/Maestro.Editors/FeatureSource/Preview Tools/Maestro/Maestro.Editors/FeatureSource/Providers Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Common Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors Tools/Maestro/Maestro.Editors/FeatureSource/Provide rs/Rdbms Tools/Maestro/Maestro.Editors/FeatureSource/Providers/SQLite Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Sdf Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Shp Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms Tools/Maestro/Maestro.Editors/Fusion Tools/Maestro/Maestro.Editors/Fusion/MapEditors Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors Tools/Maestro/Maestro.Editors/Generic Tools/Maestro/Maestro.Editors/Generic/XmlEditor Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion Tools/Maestro/Maestro.Editors/LayerDefinition Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing Tools/Maestro/Maestro.Editors/LayerDefinition/Raster Tools/Maestro/Maestro.Editors/LayerDefinition/Vector Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceEditors Tools/Maestro/Maestro.Editors/LayerDefinition/Ve ctor/Scales/SymbolParamEditors Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics Tools/Maestro/Maestro.Editors/LoadProcedure Tools/Maestro/Maestro.Editors/MapDefinition Tools/Maestro/Maestro.Editors/MapDefinition/Live Tools/Maestro/Maestro.Editors/Migration Tools/Maestro/Maestro.Editors/Packaging Tools/Maestro/Maestro.Editors/Preview Tools/Maestro/Maestro.Editors/PrintLayout Tools/Maestro/Maestro.Editors/Properties Tools/Maestro/Maestro.Editors/Resources Tools/Maestro/Maestro.Editors/SymbolDefinition Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors Tools/Maestro/Maestro.Editors/WatermarkDefinition Tools/Maestro/Maestro.Editors/WebLayout Tools/Maestro/Maestro.Editors/WebLayout/Commands Tools/Maestro/Maestro.LiveMapEditor Tools/Maestro/Maestro.LiveMapEditor/Properties Tools/Maestro/Maestro.Login Tools/Maestro/Maestro.Login/Properties Tools/Maestro/Maestro.MapViewer Tools/Maestro/Maestr o.MapViewer/Properties Tools/Maestro/Maestro.Packaging Tools/Maestro/Maestro.Packaging/Properties Tools/Maestro/Maestro.Shared.UI Tools/Maestro/Maestro.Shared.UI/Properties Tools/Maestro/MaestroAPITestRunner Tools/Maestro/MaestroAPITestRunner/Properties Tools/Maestro/MaestroAPITests Tools/Maestro/MaestroAPITests/Properties Tools/Maestro/MaestroAPITests/Resources Tools/Maestro/MaestroAPITests/UserTestData Tools/Maestro/MaestroFsPreview Tools/Maestro/MaestroFsPreview/Properties Tools/Maestro/MgCooker Tools/Maestro/MgCooker/Properties Tools/Maestro/MgCooker.Cmd Tools/Maestro/MgCooker.Cmd/Properties Tools/Maestro/MpuCalc Tools/Maestro/MpuCalc/Properties Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels/Properties Tools/Maestro/OSGeo.MapGuide.MaestroAPI Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem Tools/Maestro/OSGeo.Map Guide.MaestroAPI/CrossConnection Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature Tools/Maestro/OSGeo.MapGuide.MaestroAPI/IO Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Internal Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Conversion Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Preview Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Tile Tools/Maestro/OSGeo.MapGu ide.MaestroAPI.Http Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Commands Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Properties Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/Properties Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Commands Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Properties Tools/Maestro/Properties Tools/Maestro/ProviderTemplate Tools/Maestro/ProviderTemplate/Properties Tools/Maestro/RtMapInspector Tools/Maestro/RtMapInspector/Properties Tools/Maestro/SignMapGuideApi Tools/Maestro/SignMapGuideApi/Properties Tools/Maestro/TestData

• Next message (by thread): [mapguide-commits] r8460 - in trunk/MgDev/UnitTest/TestData: DrawingService MappingService PrintLayout ResourceService Symbology TileService Wfs Wms
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Author: jng
Date: 2014-12-25 00:20:40 -0800 (Thu, 25 Dec 2014)
New Revision: 8459

Removed:
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels.Common/
Modified:
   trunk/MgDev/UnitTest/TestData/DrawingService/InvalidDrawingSource.xml
   trunk/MgDev/UnitTest/TestData/DrawingService/MapGuideDrawingSource.xml
   trunk/MgDev/UnitTest/TestData/DrawingService/SpaceShipDrawingSource.xml
   trunk/MgDev/UnitTest/TestData/MappingService/UT_HydrographicPolygons.fs
   trunk/MgDev/UnitTest/TestData/MappingService/UT_Rail.fs
   trunk/MgDev/UnitTest/TestData/PrintLayout/MapViewportSample1.xml
   trunk/MgDev/UnitTest/TestData/ResourceService/Content2.xml
   trunk/MgDev/UnitTest/TestData/ResourceService/LibraryRepositoryContent.xml
   trunk/MgDev/UnitTest/TestData/ResourceService/SampleRepositoryContent.xml
   trunk/MgDev/UnitTest/TestData/ResourceService/SampleRepositoryHeader.xml
   trunk/MgDev/UnitTest/TestData/ResourceService/SampleResourceHeader.xml
   trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyLines.fs
   trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyPoints.fs
   trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyRoads.fs
   trunk/MgDev/UnitTest/TestData/TileService/UT_Parcels.fs
   trunk/MgDev/UnitTest/TestData/TileService/UT_RoadCenterLines.fs
   trunk/MgDev/UnitTest/TestData/TileService/UT_VotingDistricts.fs
   trunk/MgDev/UnitTest/TestData/Wfs/Sheboygan_CityLimits_Content.xml
   trunk/MgDev/UnitTest/TestData/Wfs/Sheboygan_CityLimits_Header.xml
   trunk/MgDev/UnitTest/TestData/Wfs/Sheboygan_CityLimits_Layer_Content.xml
   trunk/MgDev/UnitTest/TestData/Wfs/Sheboygan_CityLimits_Layer_Header.xml
   trunk/MgDev/UnitTest/TestData/Wms/Sheboygan_CityLimits_Content.xml
   trunk/MgDev/UnitTest/TestData/Wms/Sheboygan_CityLimits_Header.xml
   trunk/MgDev/UnitTest/TestData/Wms/Sheboygan_CityLimits_Layer_Content.xml
   trunk/MgDev/UnitTest/TestData/Wms/Sheboygan_CityLimits_Layer_Header.xml
   trunk/Tools/Maestro/LocalConfigure/Program.cs
   trunk/Tools/Maestro/LocalConfigure/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/LocalConfigure/app.config
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Commands/StartupCommand.cs
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Editor/EditorFactories.cs
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Manifest.addin
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition230ItemTemplate.cs
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition240ItemTemplate.cs
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SQLiteLoadProcedureItemTemplate.cs
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SymbolDefinition110ItemTemplate.cs
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SymbolDefinition240ItemTemplate.cs
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer110ItemTemplate.cs
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer120ItemTemplate.cs
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer130ItemTemplate.cs
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer230ItemTemplate.cs
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer240ItemTemplate.cs
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition230ItemTemplate.cs
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition240ItemTemplate.cs
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout110ItemTemplate.cs
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout240ItemTemplate.cs
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout260ItemTemplate.cs
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/app.config
   trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Commands/StartupCommand.cs
   trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Manifest.addin
   trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/app.config
   trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/ConnectionPoolStatusCommand.cs
   trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/StartupCommand.cs
   trunk/Tools/Maestro/Maestro.AddIn.Local/Manifest.addin
   trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro.AddIn.Local/Services/LocalPreviewer.cs
   trunk/Tools/Maestro/Maestro.AddIn.Local/UI/ConnectionPoolStatusDialog.cs
   trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs
   trunk/Tools/Maestro/Maestro.AddIn.Local/UI/ZoomScaleDialog.cs
   trunk/Tools/Maestro/Maestro.AddIn.Local/app.config
   trunk/Tools/Maestro/Maestro.AddIn.Local/packages.config
   trunk/Tools/Maestro/Maestro.AddIn.Scripting/Commands/StartupCommand.cs
   trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/CommandLineHistory.cs
   trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/IMemberProvider.cs
   trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/PythonConsole.cs
   trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/PythonConsoleCompletionDataProvider.cs
   trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/PythonConsoleHost.cs
   trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/PythonOutputStream.cs
   trunk/Tools/Maestro/Maestro.AddIn.Scripting/Manifest.addin
   trunk/Tools/Maestro/Maestro.AddIn.Scripting/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro.AddIn.Scripting/ScriptingConfigProperties.cs
   trunk/Tools/Maestro/Maestro.AddIn.Scripting/Services/ScriptingClasses.cs
   trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronPythonPreferences.cs
   trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronPythonRepl.cs
   trunk/Tools/Maestro/Maestro.AddIn.Scripting/app.config
   trunk/Tools/Maestro/Maestro.AddIn.Scripting/packages.config
   trunk/Tools/Maestro/Maestro.AddInManager/AboutForm.cs
   trunk/Tools/Maestro/Maestro.AddInManager/AddInControl.cs
   trunk/Tools/Maestro/Maestro.AddInManager/AddInManger.addin
   trunk/Tools/Maestro/Maestro.AddInManager/Commands.cs
   trunk/Tools/Maestro/Maestro.AddInManager/InstallableAddIn.cs
   trunk/Tools/Maestro/Maestro.AddInManager/ManagerForm.cs
   trunk/Tools/Maestro/Maestro.AddInManager/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro.AddInManager/packages.config
   trunk/Tools/Maestro/Maestro.Base/Commands/AboutCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/CacheViewerCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/CloseActiveDocumentCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/CloseAllDocumentsCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ActiveEditorConditionEvaluator.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ActiveEditorTypeConditionEvaluator.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/CloseableDocumentConditionEvaluator.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ConnectionProviderConditionEvaluator.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/CutCopyConditionEvaluator.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/DebugModeConditionEvaluator.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/MultipleSelectedItemConditionEvaluator.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/NonZeroDocumentConditionEvaluator.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/NotConnectedConditionEvaluator.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/PasteConditionEvaluator.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ResourceTypeConditionEvaluator.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/SelectedItemConditionEvaluator.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/SelectedRootItemConditionEvaluator.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/SupportedCommandConditionEvaluator.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/CopyCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/CreatePackageCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/CutCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/EditAsXmlCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/EditPackageCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/LiveMapEditorCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/LoadPackageCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/LocalFeatureSourcePreviewCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/LoginCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/MgCookerCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/NewItemCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/NotImplementedCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/OpenResourceIdCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/OptionsCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/PasteCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/PreviewResourceCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/ProfileResourceCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/QuitCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/RtMapInspectorCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SaveAllCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SaveResourceAsCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SaveResourceCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/ServerMonitorCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteAdministratorCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CompareResourceCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CompileFullDependencyListCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CopyMoveToAnotherServerCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CopyResourceIdCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CreateLayersFromFeatureSourceCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DeleteSelectedItemsCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DisconnectCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DuplicateResourceCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/EditResourceHeaderCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ExtractSymbolsCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/FindReplaceXmlContentCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/GetLayerSpatialContextCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/MigrateResourceCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/NewFolderCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/OpenResourceCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/OpenWithXmlEditorCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/PurgeFeatureSourceCacheCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RefreshCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RenameCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RepointCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ResourcePropertiesCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/SaveResourceContentToDiskCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/SetupFolderStructureCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ShowSpatialContextsCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/TestFeatureSourceCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/TestResourceCompatibilityCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ValidateCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/StartupCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenCoordinateSystemPickerCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenResourceCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenSymbolBrowserCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenUnmanagedResourceCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Test/SelectFdoProviderCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Test/TestCommands.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Test/TriggerDbXmlCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/TipOfTheDayCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/TranslateLayoutCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/UserGuideCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/ValidateEditedResourceCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/ViewXmlChangesCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/XmlEditCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/DrawingSourceEditor.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/EditorContentBase.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/FeatureSourceEditor.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/FsEditorOptionPanel.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/FusionEditor.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/IEditorFactory.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/IEditorViewContent.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/LayerDefinitionEditor.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/LoadProcedureEditor.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/MapDefinitionEditor.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/PrintLayoutEditor.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/ResourceEditorService.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/SymbolDefinitionEditor.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/UnsupportedEditorControl.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/WatermarkDefinitionEditor.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/WebLayoutEditor.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/XmlEditor.cs
   trunk/Tools/Maestro/Maestro.Base/Events/EventWatcher.cs
   trunk/Tools/Maestro/Maestro.Base/Maestro.Base.addin
   trunk/Tools/Maestro/Maestro.Base/MaestroPaths.cs
   trunk/Tools/Maestro/Maestro.Base/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro.Base/Services/ClipboardService.cs
   trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlerService.cs
   trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/DwfFileHandler.cs
   trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/PackageFileHandler.cs
   trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SdfFileHandler.cs
   trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/ShpFileHandler.cs
   trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SltFileHandler.cs
   trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/XmlResFileHandler.cs
   trunk/Tools/Maestro/Maestro.Base/Services/IDragDropHandler.cs
   trunk/Tools/Maestro/Maestro.Base/Services/NewItemTemplateService.cs
   trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs
   trunk/Tools/Maestro/Maestro.Base/Services/ServerConnectionManager.cs
   trunk/Tools/Maestro/Maestro.Base/Services/ServiceRegistry.cs
   trunk/Tools/Maestro/Maestro.Base/Services/UrlLauncherService.cs
   trunk/Tools/Maestro/Maestro.Base/Services/ViewContentManager.cs
   trunk/Tools/Maestro/Maestro.Base/Templates/ApplicationDefinitionItemTemplate.cs
   trunk/Tools/Maestro/Maestro.Base/Templates/DrawingLayerDefinitionItemTemplate.cs
   trunk/Tools/Maestro/Maestro.Base/Templates/DrawingSourceItemTemplate.cs
   trunk/Tools/Maestro/Maestro.Base/Templates/DwfLoadProcedureItemTemplate.cs
   trunk/Tools/Maestro/Maestro.Base/Templates/FeatureSourceItemTemplate.cs
   trunk/Tools/Maestro/Maestro.Base/Templates/ItemTemplate.cs
   trunk/Tools/Maestro/Maestro.Base/Templates/MapDefinitionItemTemplate.cs
   trunk/Tools/Maestro/Maestro.Base/Templates/PrintLayoutItemTemplate.cs
   trunk/Tools/Maestro/Maestro.Base/Templates/RasterLayerDefinitionItemTemplate.cs
   trunk/Tools/Maestro/Maestro.Base/Templates/SdfLoadProcedureItemTemplate.cs
   trunk/Tools/Maestro/Maestro.Base/Templates/ShpLoadProcedureItemTemplate.cs
   trunk/Tools/Maestro/Maestro.Base/Templates/SymbolDefinitionItemTemplate.cs
   trunk/Tools/Maestro/Maestro.Base/Templates/UserItemTemplate.cs
   trunk/Tools/Maestro/Maestro.Base/Templates/VectorLayerDefinitionItemTemplate.cs
   trunk/Tools/Maestro/Maestro.Base/Templates/WebLayoutItemTemplate.cs
   trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/BoundsPicker.cs
   trunk/Tools/Maestro/Maestro.Base/UI/BroadcastTextWriter.cs
   trunk/Tools/Maestro/Maestro.Base/UI/ConfirmDeleteResourcesDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/DirtyStateConfirmationDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/ISiteExplorer.cs
   trunk/Tools/Maestro/Maestro.Base/UI/IncompatibleResourcesDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/LabelLocalizationDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/MessageViewer.cs
   trunk/Tools/Maestro/Maestro.Base/UI/NewFolderDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/NewResourceDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/OpenResourceIdDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/OutboundRequestViewer.cs
   trunk/Tools/Maestro/Maestro.Base/UI/Packaging/CreatePackageDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/Preferences/ConfigProperties.cs
   trunk/Tools/Maestro/Maestro.Base/UI/Preferences/EditorPreferencesCtrl.cs
   trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.cs
   trunk/Tools/Maestro/Maestro.Base/UI/Preferences/IPreferenceSheet.cs
   trunk/Tools/Maestro/Maestro.Base/UI/Preferences/OptionsDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/ProfilingDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/RenameItemDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/RepositoryTreeModel.cs
   trunk/Tools/Maestro/Maestro.Base/UI/ResourceDependencyListDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/ResourceHeaderXmlDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/ResourceIconCache.cs
   trunk/Tools/Maestro/Maestro.Base/UI/ResourceIdNavigator.cs
   trunk/Tools/Maestro/Maestro.Base/UI/ResourcePropertiesDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/SiteExplorer.cs
   trunk/Tools/Maestro/Maestro.Base/UI/SiteExplorerDragDropHandler.cs
   trunk/Tools/Maestro/Maestro.Base/UI/TestResourceCompatibilityDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/TipOfTheDayDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/ValidationResultsDialog.cs
   trunk/Tools/Maestro/Maestro.Base/Workbench.cs
   trunk/Tools/Maestro/Maestro.Base/WorkbenchInitializer.cs
   trunk/Tools/Maestro/Maestro.Base/app.config
   trunk/Tools/Maestro/Maestro.Base/packages.config
   trunk/Tools/Maestro/Maestro.Editors/Common/AutoCompletion.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/ColorComboBox.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/ColorComboWithTransparency.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/ColorPickerDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/CoordinateSystemPicker.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/CustomCombo.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/EditorBindableCollapsiblePanel.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/EditorWindow.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/Expression/FdoExpressionCompletionDataProvider.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/Expression/LookupExpressionBuilder.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/Expression/RangeExpressionBuilder.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/ExpressionEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/FindReplaceDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/GenericInputDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/GenericItemSelectionDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/IExpressionEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/ITextEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/ImageStylePicker.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/MonoCompatibleExpressionEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/NsDoc.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/RepointerDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryTreeModel.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/SourceDataCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/SymbolPicker.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/TextEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/UnmanagedFileBrowser.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/XmlContentErrorDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Diagnostics/FdoCacheViewer.cs
   trunk/Tools/Maestro/Maestro.Editors/Diagnostics/NsDoc.cs
   trunk/Tools/Maestro/Maestro.Editors/Diagnostics/ServerStatusMonitor.cs
   trunk/Tools/Maestro/Maestro.Editors/Diff/CompareResourceDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.cs
   trunk/Tools/Maestro/Maestro.Editors/Diff/XmlCompareUtil.cs
   trunk/Tools/Maestro/Maestro.Editors/DrawingSource/DrawingSourceEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/DrawingSource/NsDoc.cs
   trunk/Tools/Maestro/Maestro.Editors/DrawingSource/SourceSectionCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/EditorBase.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/CoordSys/CoordSysOverrideDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/CoordSysOverrideCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/CreateLayersFromFeatureSourceDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/CalculationSettings.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/ExtendedClassSettings.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/JoinSettings.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/SelectJoinKeyDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/ExtensionsCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/FeatureSourceEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/FsEditorMap.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/NsDoc.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/IQueryControl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/PreviewPane.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/SqlQueryCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/StandardQueryCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Common/FilteredLogicalSchemaDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/GdalProviderCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/GenericCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/OracleDriver.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/OracleMsDriver.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/SqlServerDriver.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcDriverInfo.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcDriverMap.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcProviderCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableConfigCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableConfigurationDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableOverrideItem.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ConnectionStringCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/DSNCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/IOdbcSubEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/KnownDriversCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ManagedCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/MySqlCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/PostgreSqlCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/SQLite/SQLiteFileCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Sdf/SdfFileCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/SetCredentialsDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Shp/ShpFileCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/RasterDefinitionCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/SpatialContextInfoDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/SpatialContextsDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/FsEditorMap.xml
   trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexLayoutSettingsCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditorContext.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/FusionWidgetEditorMap.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/MapEditors/CommercialMapEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/MapEditors/EditorFactory.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/MapEditors/GenericEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/MapEditors/MapGuideEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/MapSettingsCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/MenuCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/NewWidgetDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/NsDoc.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/GenericWidgetCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/IWidgetEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/NsDoc.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetEditorBase.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetInfoDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetManagementDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetReferenceCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetSettingsCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/NsDoc.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/ResourceDataPanel.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/QualifiedName.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/QualifiedNameCollection.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlCompletionData.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlCompletionDataCollection.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlCompletionDataProvider.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlElementPath.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlParser.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlSchemaAssociation.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlSchemaCompletionData.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlSchemaCompletionDataCollection.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlSchemaManager.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/XmlEditorOptions.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/XmlFoldingStrategy.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/XmlFormattingStrategy.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorSettings.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlTextEditorControl.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlValidationResult.cs
   trunk/Tools/Maestro/Maestro.Editors/IEditorBindable.cs
   trunk/Tools/Maestro/Maestro.Editors/IEditorService.cs
   trunk/Tools/Maestro/Maestro.Editors/LastSelectedFolder.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/DrawingLayerEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/LayerEditorSettings.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/NsDoc.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerAdvancedSectionCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerVisibilitySectionCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/RasterLayerEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/FeaturePreviewRender.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/RuleGridView.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/RuleModel.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/VectorScaleRangeGrid.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/ILayerStylePreviewable.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/CompositeStyleListCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/Condition.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionList.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/EditorTemplateForm.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ExplodeThemeDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ItemStyle.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceEditors/ReferenceCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancePropertiesDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolParamEditors/BooleanEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolParamEditors/NumberEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ScaleRangeEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/StyleImageCache.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ColorBrewer.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/DwfTransformationCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/ExecuteCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/InputFilesCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/LoadProcedureEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/LoadTargetCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/NsDoc.cs
   trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/SdfTransformationCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/ShpTransformationCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/SqliteTransformationCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/CommonPropertyCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ExtentCalculationDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/FiniteScaleListCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/GroupPropertiesCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/Live/DragMessages.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/Live/NewGroupDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorDrawOrder.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorLegend.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorRepositoryView.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ManualScaleEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapDefinitionEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapSettingsSectionCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapTreeModels.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/NsDoc.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ScaleListGenerator.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/SelectedItemsDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Migration/CopyMoveToServerDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Migration/MigrateDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Migration/NsDoc.cs
   trunk/Tools/Maestro/Maestro.Editors/NsDoc.cs
   trunk/Tools/Maestro/Maestro.Editors/OdbcDriverMap.xml
   trunk/Tools/Maestro/Maestro.Editors/Packaging/AddResourceEntryDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Packaging/EditResourceDataEntryDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Packaging/NsDoc.cs
   trunk/Tools/Maestro/Maestro.Editors/Packaging/PackageEditorDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Preview/DefaultResourcePreviewer.cs
   trunk/Tools/Maestro/Maestro.Editors/Preview/IResourcePreviewer.cs
   trunk/Tools/Maestro/Maestro.Editors/Preview/IUrlLauncherService.cs
   trunk/Tools/Maestro/Maestro.Editors/Preview/LocalMapPreviewer.cs
   trunk/Tools/Maestro/Maestro.Editors/Preview/MapPreviewDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Preview/PreviewSettings.cs
   trunk/Tools/Maestro/Maestro.Editors/Preview/ResourcePreviewEngine.cs
   trunk/Tools/Maestro/Maestro.Editors/Preview/ResourcePreviewFactory.cs
   trunk/Tools/Maestro/Maestro.Editors/Preview/StubPreviewer.cs
   trunk/Tools/Maestro/Maestro.Editors/PrintLayout/LogoDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/PrintLayout/NsDoc.cs
   trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintCustomLogosSectionCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintCustomTextSectionCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintLayoutEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintPagePropertiesSectionCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/PrintLayout/TextDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro.Editors/RepositoryHandle.cs
   trunk/Tools/Maestro/Maestro.Editors/RepositoryIcons.cs
   trunk/Tools/Maestro/Maestro.Editors/ResourceEditorServiceBase.cs
   trunk/Tools/Maestro/Maestro.Editors/Resources/CommandTypesDataset.xml
   trunk/Tools/Maestro/Maestro.Editors/Resources/GeometryStyleComboDataset.xml
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/AdvancedSettingsCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/CompoundSymbolDefinitionEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ExtractSymbolLibraryDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GeneralSettingsCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/NsDoc.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParameterSelector.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParametersCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolEditorService.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolField.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolGraphicsCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolPreviewDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/UsageContextsCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/NsDoc.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/TilePositionEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkContentCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditorDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkSettingsCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/XYPositionEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/WebLayout/CommandIconCache.cs
   trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/InvokeScriptCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/InvokeURLCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/SearchCmdCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/WebLayout/CustomCommandPropertyCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/WebLayout/MenuEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/WebLayout/MenuModel.cs
   trunk/Tools/Maestro/Maestro.Editors/WebLayout/NsDoc.cs
   trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayout3SettingsCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutCommandsCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/packages.config
   trunk/Tools/Maestro/Maestro.LiveMapEditor/AboutDialog.cs
   trunk/Tools/Maestro/Maestro.LiveMapEditor/MainForm.cs
   trunk/Tools/Maestro/Maestro.LiveMapEditor/MapSettingsDialog.cs
   trunk/Tools/Maestro/Maestro.LiveMapEditor/Program.cs
   trunk/Tools/Maestro/Maestro.LiveMapEditor/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro.LiveMapEditor/ResourceEditorService.cs
   trunk/Tools/Maestro/Maestro.LiveMapEditor/app.config
   trunk/Tools/Maestro/Maestro.Login/HttpLoginCtrl.cs
   trunk/Tools/Maestro/Maestro.Login/ILoginCtrl.cs
   trunk/Tools/Maestro/Maestro.Login/LocalLoginCtrl.cs
   trunk/Tools/Maestro/Maestro.Login/LocalNativeLoginCtrl.cs
   trunk/Tools/Maestro/Maestro.Login/LocalNativeStubCtrl.cs
   trunk/Tools/Maestro/Maestro.Login/LocalStubCtrl.cs
   trunk/Tools/Maestro/Maestro.Login/LoginDialog.cs
   trunk/Tools/Maestro/Maestro.Login/NsDoc.cs
   trunk/Tools/Maestro/Maestro.Login/PreferedSite.cs
   trunk/Tools/Maestro/Maestro.Login/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro.Login/WaitCursor.cs
   trunk/Tools/Maestro/Maestro.MapViewer/CoreTypes.cs
   trunk/Tools/Maestro/Maestro.MapViewer/DefaultToolbar.cs
   trunk/Tools/Maestro/Maestro.MapViewer/Interfaces.cs
   trunk/Tools/Maestro/Maestro.MapViewer/Legend.cs
   trunk/Tools/Maestro/Maestro.MapViewer/LegendPresenter.cs
   trunk/Tools/Maestro/Maestro.MapViewer/MapStatusTracker.cs
   trunk/Tools/Maestro/Maestro.MapViewer/MapViewer.cs
   trunk/Tools/Maestro/Maestro.MapViewer/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro.Packaging/NsDoc.cs
   trunk/Tools/Maestro/Maestro.Packaging/PackageBuilder.cs
   trunk/Tools/Maestro/Maestro.Packaging/PackageProgress.cs
   trunk/Tools/Maestro/Maestro.Packaging/PackageUploadOptionDialog.cs
   trunk/Tools/Maestro/Maestro.Packaging/PackageUploadResultDialog.cs
   trunk/Tools/Maestro/Maestro.Packaging/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro.Packaging/ResourceDataItem.cs
   trunk/Tools/Maestro/Maestro.Packaging/ResourceItem.cs
   trunk/Tools/Maestro/Maestro.Packaging/UploadPackageResult.cs
   trunk/Tools/Maestro/Maestro.Packaging/packages.config
   trunk/Tools/Maestro/Maestro.Shared.UI/BusyWaitDialog.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/CancelException.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/CheckBoxBinder.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/CollapsiblePanel.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/ComboBoxBinder.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/DialogFactory.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/ErrorDialog.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/ISubView.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/IViewContent.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/IViewContentManager.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/IWorkbenchInitializer.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/NumericBinder.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/ProgressDialog.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/ServiceBase.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/SingletonViewContent.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/TabFactory.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/TextBoxBinder.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/ViewContentBase.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/ViewContentManagerBase.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/WaitCursor.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/WorkbenchBase.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/packages.config
   trunk/Tools/Maestro/Maestro/App.config
   trunk/Tools/Maestro/Maestro/Data/TipOfTheDay/en.xml
   trunk/Tools/Maestro/Maestro/Program.cs
   trunk/Tools/Maestro/Maestro/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro/packages.config
   trunk/Tools/Maestro/Maestro/packages/repositories.config
   trunk/Tools/Maestro/MaestroAPITestRunner/App.config
   trunk/Tools/Maestro/MaestroAPITestRunner/ConnectionProviders.SDK.xml
   trunk/Tools/Maestro/MaestroAPITestRunner/ConnectionProviders.xml
   trunk/Tools/Maestro/MaestroAPITestRunner/Program.cs
   trunk/Tools/Maestro/MaestroAPITestRunner/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/MaestroAPITestRunner/TestMaestroAPI.LocalNative.xml
   trunk/Tools/Maestro/MaestroAPITestRunner/TestMaestroAPI.xml
   trunk/Tools/Maestro/MaestroAPITestRunner/packages.config
   trunk/Tools/Maestro/MaestroAPITests/CapabilityTests.cs
   trunk/Tools/Maestro/MaestroAPITests/ConfigurationTests.cs
   trunk/Tools/Maestro/MaestroAPITests/ConnectionTestBase.cs
   trunk/Tools/Maestro/MaestroAPITests/ExpressionTests.cs
   trunk/Tools/Maestro/MaestroAPITests/FeatureReaderTests.cs
   trunk/Tools/Maestro/MaestroAPITests/HttpConnectionTests.cs
   trunk/Tools/Maestro/MaestroAPITests/HttpSiteTests.cs
   trunk/Tools/Maestro/MaestroAPITests/LocalConnectionTests.cs
   trunk/Tools/Maestro/MaestroAPITests/LocalNativeFeatureTests.cs
   trunk/Tools/Maestro/MaestroAPITests/LocalNativePerformanceTests.cs
   trunk/Tools/Maestro/MaestroAPITests/MiscTests.cs
   trunk/Tools/Maestro/MaestroAPITests/ObjectTests.cs
   trunk/Tools/Maestro/MaestroAPITests/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/MaestroAPITests/ResourceTests.cs
   trunk/Tools/Maestro/MaestroAPITests/Resources/FeatureJoinSelectSample.xml
   trunk/Tools/Maestro/MaestroAPITests/Resources/SelectFeatureSample.xml
   trunk/Tools/Maestro/MaestroAPITests/Resources/SelectSqlSample.xml
   trunk/Tools/Maestro/MaestroAPITests/RuntimeMapTests.cs
   trunk/Tools/Maestro/MaestroAPITests/SchemaTests.cs
   trunk/Tools/Maestro/MaestroAPITests/SerializationTests.cs
   trunk/Tools/Maestro/MaestroAPITests/TestControl.cs
   trunk/Tools/Maestro/MaestroAPITests/UserTestData/1896.xml
   trunk/Tools/Maestro/MaestroAPITests/UserTestData/InvalidLayer.xml
   trunk/Tools/Maestro/MaestroAPITests/UserTestData/NASA_WMS_config_doc.xml
   trunk/Tools/Maestro/MaestroAPITests/UserTestData/SpaceShip.xml
   trunk/Tools/Maestro/MaestroAPITests/UserTestData/TestMapWithInvalidLayers.xml
   trunk/Tools/Maestro/MaestroAPITests/UserTestData/wms_config_example1.xml
   trunk/Tools/Maestro/MaestroAPITests/UserTestData/wms_config_example2.xml
   trunk/Tools/Maestro/MaestroAPITests/ValidationTests.cs
   trunk/Tools/Maestro/MaestroAPITests/packages.config
   trunk/Tools/Maestro/MaestroFsPreview/MainForm.cs
   trunk/Tools/Maestro/MaestroFsPreview/Program.cs
   trunk/Tools/Maestro/MaestroFsPreview/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/MaestroFsPreview/app.config
   trunk/Tools/Maestro/MgCooker.Cmd/Program.cs
   trunk/Tools/Maestro/MgCooker.Cmd/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/MgCooker.Cmd/app.config
   trunk/Tools/Maestro/MgCooker/CommandLineParser.cs
   trunk/Tools/Maestro/MgCooker/Program.cs
   trunk/Tools/Maestro/MgCooker/Progress.cs
   trunk/Tools/Maestro/MgCooker/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/MgCooker/SetupRun.cs
   trunk/Tools/Maestro/MgCooker/app.config
   trunk/Tools/Maestro/MpuCalc/App.config
   trunk/Tools/Maestro/MpuCalc/Program.cs
   trunk/Tools/Maestro/MpuCalc/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/MpuCalc/packages.config
   trunk/Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels/ModelSetup.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Commands/HttpCreateRuntimeMap.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Commands/HttpDescribeRuntimeMap.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Commands/HttpGetFdoCacheInfo.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Commands/HttpGetResourceContents.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpCapabilities.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpCoordinateSystem.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpCoordinateSystemCatalog.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpCoordinateSystemCategory.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpResourcePreviewUrlGenerator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpServerConnection.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/RequestBuilder.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlDataReader.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlFeatureReader.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlReaderBase.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlRecord.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalCapabilities.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalRuntimeMap.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/packages.config
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Commands/FeatureCommandsImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Commands/LocalGetResourceContents.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeCapabilities.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeConnection.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeCoordinateSystem.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeCoordinateSystemCatalog.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeCoordinateSystemCategory.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeDataReader.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeFeature.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeFeatureReader.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeRecord.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeSimpleTransform.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeSqlReader.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/MgReadOnlyStream.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Utility.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ArgumentParser.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/BindingListExtensions.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/ConnectionCapabilities.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/NsDoc.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Check.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/CommandType.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/CreateRuntimeMap.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/DescribeRuntimeMap.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/ExecuteLoadProcedure.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/FeatureManipulationCommandImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/FeatureManipulationCommands.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/ICommand.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/IGetFdoCacheInfo.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/IGetResourceContents.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/NsDoc.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ConnectionProviderRegistry.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ConnectionProviders.xml
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ActualCoordinateSystem.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystem.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemBase.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemCatalog.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemCategory.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/DegreeBasedCoordinateSystem.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/FeetBasedCoordinateSystem.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ICoordinateSystemCatalog.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ISimpleTransform.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/MeterBasedCoordinateSystem.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/NsDoc.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CredentialWriter.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/NsDoc.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceMigrator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceRebaser.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CsHelper.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Enums.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/CustomPropertyNotFoundException.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/DuplicateKeyException.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/ExpressionException.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/MaestroException.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/NestedExceptionMessageProcessor.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/NsDoc.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/NullExtentException.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/ResourceConversionException.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/SerializationException.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/UnsupportedResourceTypeException.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/UnsupportedServiceTypeException.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/ExpressionEngine.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/ExpressionFeatureReader.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/FdoFunctionNamespace.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/MgFunctionNamespace.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/NsDoc.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/ClrFdoTypeMap.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/FeatureBase.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/FeatureReaderBase.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IFeatureReader.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IReader.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/LimitingFeatureReader.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/MutableFeatureBase.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/MutableRecordBase.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/NsDoc.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/PropertyValue.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/ReaderBase.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/RecordBase.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/IConnectionCapabilities.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/IO/NsDoc.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/IO/ReadOnlyRewindableStream.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/IServerConnection.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Internal/FixedWKTReader.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/LengthyOperationCallbackArgs.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/MaestroApiProviderAttribute.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/Collections.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/MapObservable.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/MapSelection.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/NsDoc.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMap.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapGroup.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/MgServerConnectionBase.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/NsDoc.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinition.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinitionInfo.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinitionInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/CommonTypes.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/DrawingSource.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/DrawingSourceInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/Envelope.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/FdoCapabilities.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSource.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSourceInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/Geometries.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/GridLayerDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/IFdoSpatialContext.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/IRepositoryItem.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerFactory.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaceExtensions.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcFactory.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcedure.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcedureInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LongTransaction.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/MapDefinition.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/MapDefinitionInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/NsDoc.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ObjectFactory.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/PrintLayout.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/PrintLayoutInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ResourceItems.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ResourceList.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ResourcePackageManifest.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/RuntimeMapImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/RuntimeMapInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefFactory.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefinition.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolLibrary.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolLibraryInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/UnmanagedDataList.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/UntypedResource.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/WatermarkCollectionUtil.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/WatermarkInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/WebLayout.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/WebLayoutInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Platform.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/BinaryData.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/CharData.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/DiffEngine.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/TextFile.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Conversion/IResourceConverter.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Conversion/ImageSymbolConverter.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Conversion/NsDoc.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/IResource.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/IResourceValidator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/IVersionedEntity.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/NsDoc.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Preview/IResourcePreviewUrlGenerator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Preview/ResourcePreviewUrlGenerator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/ResourceContentVersionChecker.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/ResourceIdentifier.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/ResourceSchemaChain.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/ResourceTypeDescriptor.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ApplicationDefinitionValidator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLayerDefinitionValidator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLoadProcedureValidator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseMapDefinitionValidator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseSymbolDefinitionValidator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseWebLayoutValidator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/DrawingSourceValidator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/FeatureSourceValidator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/LayerDefinitionValidator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/LoadProcedureValidator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/MapDefinitionValidator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/NsDoc.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/PrintLayoutValidator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ResourceValidationContext.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ResourceValidatorLoader.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ResourceValidatorSet.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/SymbolDefinitionValidator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/SymbolLibraryValidator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ValidationResultSet.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ValidationStatusCode.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/WebLayoutValidator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ResourceTypeRegistry.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/ClassDefinition.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/DataPropertyDefinition.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/FeatureSchema.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/FeatureSourceDescription.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/GeometricPropertyDefinition.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/IFdoSerializable.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/NsDoc.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/PropertyDefinition.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/RasterPropertyDefinition.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/SchemaElement.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/XmlNamespaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/ConfigurationDocument.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/GdalConfigurationDocument.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/GdalRasterItem.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/GenericConfigurationDocument.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/NsDoc.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/OdbcConfigurationDocument.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/OdbcTableItem.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/RasterWmsItem.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/WmsConfigurationDocument.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/WmsLayerDefinition.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/Enums.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/IBinarySerializable.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/MgBinaryDeserializer.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/MgBinarySerializer.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/NsDoc.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IDrawingService.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IFeatureService.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IFusionService.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IMappingService.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IResourceService.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IService.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/ISiteService.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/ITileService.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/NsDoc.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/QueryMapOptions.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/ServiceType.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SiteVersion.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Tile/BatchSettings.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Tile/RenderThread.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utf8XmlWriter.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/WeakEventHandler.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/XmlValidator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config
   trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs
   trunk/Tools/Maestro/Properties/SignedAssemblyInfo.cs
   trunk/Tools/Maestro/Properties/SignedAssemblyInfo2.cs
   trunk/Tools/Maestro/ProviderTemplate/App.config
   trunk/Tools/Maestro/ProviderTemplate/Form1.cs
   trunk/Tools/Maestro/ProviderTemplate/Program.cs
   trunk/Tools/Maestro/ProviderTemplate/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/RtMapInspector/MainForm.cs
   trunk/Tools/Maestro/RtMapInspector/Program.cs
   trunk/Tools/Maestro/RtMapInspector/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/RtMapInspector/app.config
   trunk/Tools/Maestro/SignMapGuideApi/Program.cs
   trunk/Tools/Maestro/SignMapGuideApi/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/TestData/gen_default1_MySql_master.xml
   trunk/Tools/Maestro/TestData/gen_default1_Oracle_master.xml
   trunk/Tools/Maestro/TestData/gen_default1_SQLServerSpatial_master.xml
   trunk/Tools/Maestro/TestData/gen_default1_SqlServer2005_master.xml
   trunk/Tools/Maestro/TestData/gen_default1_SqlServer2008_master.xml
   trunk/Tools/Maestro/TestData/gen_default1_SqlServer_master.xml
Log:
Now that we have a free and full-featured IDE (VS 2013 Community). I ran the Maestro codebase through the free and awesome CodeMaid addon to tidy up the codebase. This submission is the result of the CodeMaid cleanup.

Modified: trunk/MgDev/UnitTest/TestData/DrawingService/InvalidDrawingSource.xml
===================================================================
--- trunk/MgDev/UnitTest/TestData/DrawingService/InvalidDrawingSource.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/DrawingService/InvalidDrawingSource.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -2,4 +2,4 @@
 <DrawingSource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="DrawingSource-1.0.0.xsd">
   <SourceName>%MG_DATA_FILE_PATH%CorruptedDwf.dwf</SourceName>
   <CoordinateSpace>LL84</CoordinateSpace>
-</DrawingSource>
+</DrawingSource>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/DrawingService/MapGuideDrawingSource.xml
===================================================================
--- trunk/MgDev/UnitTest/TestData/DrawingService/MapGuideDrawingSource.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/DrawingService/MapGuideDrawingSource.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -2,4 +2,4 @@
 <DrawingSource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="DrawingSource-1.0.0.xsd">
   <SourceName>%MG_DATA_FILE_PATH%test.dwf</SourceName>
   <CoordinateSpace>LL84</CoordinateSpace>
-</DrawingSource>
+</DrawingSource>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/DrawingService/SpaceShipDrawingSource.xml
===================================================================
--- trunk/MgDev/UnitTest/TestData/DrawingService/SpaceShipDrawingSource.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/DrawingService/SpaceShipDrawingSource.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -2,4 +2,4 @@
 <DrawingSource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="DrawingSource-1.0.0.xsd">
   <SourceName>%MG_DATA_FILE_PATH%SpaceShip.dwf</SourceName>
   <CoordinateSpace>LL84</CoordinateSpace>
-</DrawingSource>
+</DrawingSource>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/MappingService/UT_HydrographicPolygons.fs
===================================================================
--- trunk/MgDev/UnitTest/TestData/MappingService/UT_HydrographicPolygons.fs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/MappingService/UT_HydrographicPolygons.fs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?> 
+<?xml version="1.0" encoding="utf-8"?>
 <FeatureSource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FeatureSource-1.0.0.xsd">
-  <Provider>OSGeo.SDF.3.2</Provider> 
+  <Provider>OSGeo.SDF.3.2</Provider>
   <Parameter>
-    <Name>File</Name> 
-    <Value>%MG_DATA_FILE_PATH%UT_HydrographicPolygons.sdf</Value> 
+    <Name>File</Name>
+    <Value>%MG_DATA_FILE_PATH%UT_HydrographicPolygons.sdf</Value>
   </Parameter>
   <Parameter>
-    <Name>ReadOnly</Name> 
-    <Value>TRUE</Value> 
+    <Name>ReadOnly</Name>
+    <Value>TRUE</Value>
   </Parameter>
-</FeatureSource>
+</FeatureSource>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/MappingService/UT_Rail.fs
===================================================================
--- trunk/MgDev/UnitTest/TestData/MappingService/UT_Rail.fs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/MappingService/UT_Rail.fs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?> 
+<?xml version="1.0" encoding="utf-8"?>
   <FeatureSource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FeatureSource-1.0.0.xsd">
-  <Provider>OSGeo.SDF.3.2</Provider> 
+  <Provider>OSGeo.SDF.3.2</Provider>
   <Parameter>
-    <Name>File</Name> 
-    <Value>%MG_DATA_FILE_PATH%UT_Rail.sdf</Value> 
+    <Name>File</Name>
+    <Value>%MG_DATA_FILE_PATH%UT_Rail.sdf</Value>
   </Parameter>
   <Parameter>
-    <Name>ReadOnly</Name> 
-    <Value>TRUE</Value> 
+    <Name>ReadOnly</Name>
+    <Value>TRUE</Value>
   </Parameter>
-</FeatureSource>
+</FeatureSource>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/PrintLayout/MapViewportSample1.xml
===================================================================
--- trunk/MgDev/UnitTest/TestData/PrintLayout/MapViewportSample1.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/PrintLayout/MapViewportSample1.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -5,7 +5,7 @@
 		<ResourceId>String</ResourceId>
 		<Stylization>
 			<ResourceId>String</ResourceId>
-			<ExtendedData1/>
+			<ExtendedData1 />
 		</Stylization>
 		<Data>
 			<ResourceId>String</ResourceId>
@@ -17,12 +17,12 @@
 					<TargetProperty>String</TargetProperty>
 					<SourceProperty>String</SourceProperty>
 					<SourceUnits>String</SourceUnits>
-					<ExtendedData1/>
+					<ExtendedData1 />
 				</PropertyMapping>
 			</PropertyMappings>
-			<ExtendedData1/>
+			<ExtendedData1 />
 		</Data>
-		<ExtendedData1/>
+		<ExtendedData1 />
 		<MapName>String</MapName>
 		<HiddenLayerNames>
 			<Name>String</Name>
@@ -43,7 +43,7 @@
 				<Z>0.0</Z>
 			</ViewDirection>
 			<ModelUnits>String</ModelUnits>
-			<ExtendedData1/>
+			<ExtendedData1 />
 		</MapView>
 	</MapViewportDefinition>
-</PrintLayoutElementDefinition>
+</PrintLayoutElementDefinition>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/ResourceService/Content2.xml
===================================================================
--- trunk/MgDev/UnitTest/TestData/ResourceService/Content2.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/ResourceService/Content2.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -25,4 +25,4 @@
 		<Errors>0</Errors>
 		<Failures>1</Failures>
 	</Statistics>
-</TestRun>
+</TestRun>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/ResourceService/LibraryRepositoryContent.xml
===================================================================
--- trunk/MgDev/UnitTest/TestData/ResourceService/LibraryRepositoryContent.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/ResourceService/LibraryRepositoryContent.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <RepositoryContent xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="RepositoryContent-1.0.0.xsd">
   <Description>Library repository</Description>
-</RepositoryContent>
+</RepositoryContent>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/ResourceService/SampleRepositoryContent.xml
===================================================================
--- trunk/MgDev/UnitTest/TestData/ResourceService/SampleRepositoryContent.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/ResourceService/SampleRepositoryContent.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <RepositoryContent xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="RepositoryContent-1.0.0.xsd">
   <Description>Test repository</Description>
-</RepositoryContent>
+</RepositoryContent>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/ResourceService/SampleRepositoryHeader.xml
===================================================================
--- trunk/MgDev/UnitTest/TestData/ResourceService/SampleRepositoryHeader.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/ResourceService/SampleRepositoryHeader.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -9,4 +9,4 @@
       </Group>
     </Groups>
   </Security>
-</ResourceFolderHeader>
+</ResourceFolderHeader>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/ResourceService/SampleResourceHeader.xml
===================================================================
--- trunk/MgDev/UnitTest/TestData/ResourceService/SampleResourceHeader.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/ResourceService/SampleResourceHeader.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -3,4 +3,4 @@
   <Security>
     <Inherited>true</Inherited>
   </Security>
-</ResourceDocumentHeader>
+</ResourceDocumentHeader>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyLines.fs
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyLines.fs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyLines.fs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -9,4 +9,4 @@
     <Name>ReadOnly</Name>
     <Value>TRUE</Value>
   </Parameter>
-</FeatureSource>
+</FeatureSource>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyPoints.fs
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyPoints.fs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyPoints.fs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -9,4 +9,4 @@
     <Name>ReadOnly</Name>
     <Value>TRUE</Value>
   </Parameter>
-</FeatureSource>
+</FeatureSource>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyRoads.fs
===================================================================
--- trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyRoads.fs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/Symbology/UT_SymbologyRoads.fs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -9,4 +9,4 @@
     <Name>ReadOnly</Name>
     <Value>TRUE</Value>
   </Parameter>
-</FeatureSource>
+</FeatureSource>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/TileService/UT_Parcels.fs
===================================================================
--- trunk/MgDev/UnitTest/TestData/TileService/UT_Parcels.fs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/TileService/UT_Parcels.fs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -9,4 +9,4 @@
     <Name>ReadOnly</Name>
     <Value>TRUE</Value>
   </Parameter>
-</FeatureSource>
+</FeatureSource>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/TileService/UT_RoadCenterLines.fs
===================================================================
--- trunk/MgDev/UnitTest/TestData/TileService/UT_RoadCenterLines.fs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/TileService/UT_RoadCenterLines.fs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -9,4 +9,4 @@
     <Name>ReadOnly</Name>
     <Value>TRUE</Value>
   </Parameter>
-</FeatureSource>
+</FeatureSource>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/TileService/UT_VotingDistricts.fs
===================================================================
--- trunk/MgDev/UnitTest/TestData/TileService/UT_VotingDistricts.fs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/TileService/UT_VotingDistricts.fs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -9,4 +9,4 @@
     <Name>ReadOnly</Name>
     <Value>TRUE</Value>
   </Parameter>
-</FeatureSource>
+</FeatureSource>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/Wfs/Sheboygan_CityLimits_Content.xml
===================================================================
--- trunk/MgDev/UnitTest/TestData/Wfs/Sheboygan_CityLimits_Content.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/Wfs/Sheboygan_CityLimits_Content.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?> 
+<?xml version="1.0" encoding="UTF-8"?>
 <FeatureSource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FeatureSource-1.0.0.xsd">
-  <Provider>OSGeo.SDF.3.2</Provider> 
+  <Provider>OSGeo.SDF.3.2</Provider>
   <Parameter>
-    <Name>File</Name> 
-    <Value>%MG_DATA_FILE_PATH%Sheboygan_CityLimits.sdf</Value> 
+    <Name>File</Name>
+    <Value>%MG_DATA_FILE_PATH%Sheboygan_CityLimits.sdf</Value>
   </Parameter>
   <Parameter>
-    <Name>ReadOnly</Name> 
-    <Value>TRUE</Value> 
+    <Name>ReadOnly</Name>
+    <Value>TRUE</Value>
   </Parameter>
-</FeatureSource>
+</FeatureSource>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/Wfs/Sheboygan_CityLimits_Header.xml
===================================================================
--- trunk/MgDev/UnitTest/TestData/Wfs/Sheboygan_CityLimits_Header.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/Wfs/Sheboygan_CityLimits_Header.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -6,4 +6,4 @@
   <Security xsi:noNamespaceSchemaLocation="ResourceSecurity-1.0.0.xsd">
     <Inherited>true</Inherited>
   </Security>
-</ResourceDocumentHeader>
+</ResourceDocumentHeader>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/Wfs/Sheboygan_CityLimits_Layer_Content.xml
===================================================================
--- trunk/MgDev/UnitTest/TestData/Wfs/Sheboygan_CityLimits_Layer_Content.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/Wfs/Sheboygan_CityLimits_Layer_Content.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -43,4 +43,4 @@
       </AreaTypeStyle>
     </VectorScaleRange>
   </VectorLayerDefinition>
-</LayerDefinition>
+</LayerDefinition>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/Wfs/Sheboygan_CityLimits_Layer_Header.xml
===================================================================
--- trunk/MgDev/UnitTest/TestData/Wfs/Sheboygan_CityLimits_Layer_Header.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/Wfs/Sheboygan_CityLimits_Layer_Header.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -34,4 +34,4 @@
       </Property>
     </Simple>
   </Metadata>
-</ResourceDocumentHeader>
+</ResourceDocumentHeader>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/Wms/Sheboygan_CityLimits_Content.xml
===================================================================
--- trunk/MgDev/UnitTest/TestData/Wms/Sheboygan_CityLimits_Content.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/Wms/Sheboygan_CityLimits_Content.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?> 
+<?xml version="1.0" encoding="UTF-8"?>
 <FeatureSource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FeatureSource-1.0.0.xsd">
-  <Provider>OSGeo.SDF.3.2</Provider> 
+  <Provider>OSGeo.SDF.3.2</Provider>
   <Parameter>
-    <Name>File</Name> 
-    <Value>%MG_DATA_FILE_PATH%Sheboygan_CityLimits.sdf</Value> 
+    <Name>File</Name>
+    <Value>%MG_DATA_FILE_PATH%Sheboygan_CityLimits.sdf</Value>
   </Parameter>
   <Parameter>
-    <Name>ReadOnly</Name> 
-    <Value>TRUE</Value> 
+    <Name>ReadOnly</Name>
+    <Value>TRUE</Value>
   </Parameter>
-</FeatureSource>
+</FeatureSource>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/Wms/Sheboygan_CityLimits_Header.xml
===================================================================
--- trunk/MgDev/UnitTest/TestData/Wms/Sheboygan_CityLimits_Header.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/Wms/Sheboygan_CityLimits_Header.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -6,4 +6,4 @@
   <Security xsi:noNamespaceSchemaLocation="ResourceSecurity-1.0.0.xsd">
     <Inherited>true</Inherited>
   </Security>
-</ResourceDocumentHeader>
+</ResourceDocumentHeader>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/Wms/Sheboygan_CityLimits_Layer_Content.xml
===================================================================
--- trunk/MgDev/UnitTest/TestData/Wms/Sheboygan_CityLimits_Layer_Content.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/Wms/Sheboygan_CityLimits_Layer_Content.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -43,4 +43,4 @@
       </AreaTypeStyle>
     </VectorScaleRange>
   </VectorLayerDefinition>
-</LayerDefinition>
+</LayerDefinition>
\ No newline at end of file

Modified: trunk/MgDev/UnitTest/TestData/Wms/Sheboygan_CityLimits_Layer_Header.xml
===================================================================
--- trunk/MgDev/UnitTest/TestData/Wms/Sheboygan_CityLimits_Layer_Header.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/MgDev/UnitTest/TestData/Wms/Sheboygan_CityLimits_Layer_Header.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -34,4 +34,4 @@
       </Property>
     </Simple>
   </Metadata>
-</ResourceDocumentHeader>
+</ResourceDocumentHeader>
\ No newline at end of file

Modified: trunk/Tools/Maestro/LocalConfigure/Program.cs
===================================================================
--- trunk/Tools/Maestro/LocalConfigure/Program.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/LocalConfigure/Program.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,36 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
 using System;
-using System.Collections.Generic;
+using System.IO;
 using System.Text;
-using ICSharpCode.Core;
-using System.IO;
 using System.Xml;
 
 namespace LocalConfigure
 {
-    class Program
+    internal class Program
     {
-        static void Main(string[] args)
+        private static void Main(string[] args)
         {
             var path = Path.Combine(FileUtility.ApplicationRootPath, "Platform.ini");
             var providersPath = Path.Combine(FileUtility.ApplicationRootPath, "ConnectionProviders.xml");
@@ -72,4 +74,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/LocalConfigure/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/LocalConfigure/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/LocalConfigure/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("LocalConfigure")]
@@ -14,8 +13,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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)]
 
@@ -25,12 +24,12 @@
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file

Modified: trunk/Tools/Maestro/LocalConfigure/app.config
===================================================================
--- trunk/Tools/Maestro/LocalConfigure/app.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/LocalConfigure/app.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,3 +1,6 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client" />
+    </startup>
+</configuration>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro/App.config
===================================================================
--- trunk/Tools/Maestro/Maestro/App.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro/App.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,52 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <!-- 
+    <!--
     If you use the Local Native Connection, setup assembly binding redirection by
     editing this file here. For more information, visit the following links:
-    
+
     http://trac.osgeo.org/mapguide/wiki/maestro/MaestroAPI/MapGuideDotNetApiVersions
-    
+
     http://themapguyde.blogspot.com/2010/10/using-maestro-in-native-mode-with.html
-    
+
     The example below (commented out) sets up MapGuideDotNetApi to redirect to 2.2
     version of the official MapGuide dlls assuming the instructions in the 2nd link
     were carried out.
-    
+
     Note that Local Native Connection is not available for Mono.
     -->
-  <!--
+    <!--
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
                 <assemblyIdentity name="MapGuideDotNetApi" publicKeyToken="f526c48929fda856" />
 
-                <codeBase version="1.0.0.1" href="MapGuideDotNetApi-2.2.dll"/>
-                
-                <bindingRedirect oldVersion="2.0.0.2308" newVersion="1.0.0.1" />
+                <codeBase version="1.0.0.1" href="MapGuideDotNetApi-2.2.dll" />
 
+                <bindingRedirect oldVersion="2.0.0.2308" newVersion="1.0.0.1" />
             </dependentAssembly>
         </assemblyBinding>
     </runtime>
     -->
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
-  </startup>
-  <!-- 
-  Uncomment the section below for proxy server support. 
-  
-  Note this doesn't work in Mono (see http://trac.osgeo.org/mapguide/ticket/2414)  
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+    </startup>
+    <!--
+  Uncomment the section below for proxy server support.
+
+  Note this doesn't work in Mono (see http://trac.osgeo.org/mapguide/ticket/2414)
   -->
-  <!--
+    <!--
   <system.net>
     <defaultProxy useDefaultCredentials="true" />
   </system.net>
   -->
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly>
+                <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+</configuration>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro/Data/TipOfTheDay/en.xml
===================================================================
--- trunk/Tools/Maestro/Maestro/Data/TipOfTheDay/en.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro/Data/TipOfTheDay/en.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -5,7 +5,7 @@
 
         http://trac.osgeo.org/mapguide
 
-        Please be a descriptive as possible when filing issues. For bugs, a 
+        Please be a descriptive as possible when filing issues. For bugs, a
         step-by-step process of reproducing the bug is very helpful.
     </TipOfTheDay>
     <TipOfTheDay>
@@ -24,7 +24,7 @@
     <TipOfTheDay>
         Resource validation can detect and diagnose many common MapGuide problems.
 
-        To validate a resource, right click it in the Site Explorer and choose 
+        To validate a resource, right click it in the Site Explorer and choose
         "Validate"
     </TipOfTheDay>
     <TipOfTheDay>
@@ -38,7 +38,7 @@
         and move these commands between web layouts.
     </TipOfTheDay>
     <TipOfTheDay>
-        If Maestro cannot find a specialized editor that supports the resource you 
+        If Maestro cannot find a specialized editor that supports the resource you
         want to open, it will use the XML editor as a fallback option.
     </TipOfTheDay>
     <TipOfTheDay>
@@ -50,14 +50,14 @@
     <TipOfTheDay>
         Items in the Site Explorer are colored based on whether they are open and/or
         have been edited.
-        
+
         You can configure these colors in the Maestro options.
     </TipOfTheDay>
     <TipOfTheDay>
         The Local Feature Source Preview tool is a powerful way to inspect the data
-        and structure of any Feature Source. 
-        
-        This tool is accessible from the Tools menu and also the Feature Source 
+        and structure of any Feature Source.
+
+        This tool is accessible from the Tools menu and also the Feature Source
         editor.
     </TipOfTheDay>
     <TipOfTheDay>
@@ -68,20 +68,20 @@
     </TipOfTheDay>
     <TipOfTheDay>
         If you want to use Google/Bing/Yahoo maps with Fusion, your Map Definition
-        needs to be in the Popular Visualisation Mercator coordinate system. 
-        
+        needs to be in the Popular Visualisation Mercator coordinate system.
+
         The coordinate system code for this is WGS84.PseudoMercator
     </TipOfTheDay>
     <TipOfTheDay>
         If you want to use Google/Bing/Yahoo maps with Fusion, Google and Yahoo maps
-        require API keys. Bing does not require API keys. 
-        
-        Please carefully read the terms and conditions of each respective mapping 
+        require API keys. Bing does not require API keys.
+
+        Please carefully read the terms and conditions of each respective mapping
         provider.
     </TipOfTheDay>
     <TipOfTheDay>
-        Previews of Symbols from a Symbol Library in the Layer Definition editor will 
-        currently only show the Symbol as-is. It won't take into account the size and 
+        Previews of Symbols from a Symbol Library in the Layer Definition editor will
+        currently only show the Symbol as-is. It won't take into account the size and
         color override settings of your point rule.
     </TipOfTheDay>
     <TipOfTheDay>
@@ -90,32 +90,32 @@
     </TipOfTheDay>
     <TipOfTheDay>
         Check out the author's blog for other MapGuide, Maestro and FDO tips and tricks.
-        
+
         http://themapguyde.blogspot.com
     </TipOfTheDay>
     <TipOfTheDay>
         Do you find Maestro very useful for you? Consider making a Paypal donation to
-        the author. 
-        
+        the author.
+
         The donation link is in the about dialog under: Help - About
     </TipOfTheDay>
     <TipOfTheDay>
-        The coordinate system picker allows fast coordinate system lookup by code, WKT 
+        The coordinate system picker allows fast coordinate system lookup by code, WKT
         and EPSG number.
     </TipOfTheDay>
     <TipOfTheDay>
-        The repointer context command allows you to redirect all current references 
+        The repointer context command allows you to redirect all current references
         to the selected resource to reference another resource of your choice.
     </TipOfTheDay>
     <TipOfTheDay>
         You can clear any cached feature source schema information by right-clicking
-        the feature source in the Site Explorer and selecting the 
+        the feature source in the Site Explorer and selecting the
         "Purge Cached Schema Information" context menu command.
     </TipOfTheDay>
     <TipOfTheDay>
-        Maestro only supports a sub-set of Load Procedures. Maestro does not support 
+        Maestro only supports a sub-set of Load Procedures. Maestro does not support
         the following Load Procedure types:
-        
+
          - DWG Load Procedure type and any of its associated options
          - Raster Load Procedure type and any of its associated options
          - Convert to SDF option (SDF/SHP Load Procedures)

Modified: trunk/Tools/Maestro/Maestro/Program.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/Program.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro/Program.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,50 +1,51 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Reflection;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using ICSharpCode.Core.Services;
 using ICSharpCode.Core.WinForms;
 using Maestro.Base;
-using Maestro.Base.Events;
 using Maestro.Base.Services;
 using Maestro.Base.UI;
+using Maestro.Editors.Common;
 using Maestro.Login;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
-using Maestro.Editors.Common;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Windows.Forms;
 
 namespace Maestro
 {
-    static class Program
+    internal static class Program
     {
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
         [STAThread]
-        static void Main()
+        private static void Main()
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(true);
@@ -139,7 +140,8 @@
             LoggingService.Info("Initializing Workbench..."); //NOXLATE
             // Workbench is our class from the base project, this method creates an instance
             // of the main form.
-            ServiceRegistry.Initialize(() => {
+            ServiceRegistry.Initialize(() =>
+            {
                 //DIRTY DIRTY HACK: I'm getting tired of Mono workarounds. But background resource
                 //preview preparation has a chance of clogging up if the main window is initially maximized
                 Workbench.InitializeWorkbench(new WorkbenchInitializer(!Platform.IsRunningOnMono));
@@ -165,7 +167,7 @@
             });
         }
 
-        static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+        private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
             var ex = e.ExceptionObject as Exception;
             if (ex != null)
@@ -181,12 +183,12 @@
             }
         }
 
-        static void CurrentDomain_AssemblyLoad(object sender, AssemblyLoadEventArgs args)
+        private static void CurrentDomain_AssemblyLoad(object sender, AssemblyLoadEventArgs args)
         {
             LoggingService.InfoFormatted("Loaded assembly: {0}", args.LoadedAssembly.GetName().Name); //NOXLATE
         }
 
-        static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)
+        private static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)
         {
             var ex = e.Exception;
             if (XmlContentErrorDialog.IsDbXmlError(ex) && XmlContentErrorDialog.HasOriginalXml(ex))
@@ -200,10 +202,10 @@
         }
     }
 
-    sealed class MaestroServiceManager : ServiceManager
+    internal sealed class MaestroServiceManager : ServiceManager
     {
-        static ILoggingService loggingService = new TextWriterLoggingService(BroadcastTextWriter.Instance);
-        static IMessageService messageService = new WinFormsMessageService(); //new TextWriterMessageService(Console.Out);
+        private static ILoggingService loggingService = new TextWriterLoggingService(BroadcastTextWriter.Instance);
+        private static IMessageService messageService = new WinFormsMessageService(); //new TextWriterMessageService(Console.Out);
 
         public override ILoggingService LoggingService
         {
@@ -225,4 +227,4 @@
                 return null;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Maestro")]
@@ -11,8 +10,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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)]
 

Modified: trunk/Tools/Maestro/Maestro/packages/repositories.config
===================================================================
--- trunk/Tools/Maestro/Maestro/packages/repositories.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro/packages/repositories.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -10,6 +10,7 @@
   <repository path="..\..\MaestroAPITestRunner\packages.config" />
   <repository path="..\..\MaestroAPITests\packages.config" />
   <repository path="..\..\MpuCalc\packages.config" />
+  <repository path="..\..\OSGeo.MapGuide.MaestroAPI.Http\packages.config" />
   <repository path="..\..\OSGeo.MapGuide.MaestroAPI.Local\packages.config" />
   <repository path="..\..\OSGeo.MapGuide.MaestroAPI.Rest\packages.config" />
   <repository path="..\..\OSGeo.MapGuide.MaestroAPI\packages.config" />

Modified: trunk/Tools/Maestro/Maestro/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro/packages.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro/packages.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="IronPython" version="2.7.4" targetFramework="net40" />
+    <package id="IronPython" version="2.7.4" targetFramework="net40" />
 </packages>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Commands/StartupCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Commands/StartupCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Commands/StartupCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
-using Maestro.Base;
 using OSGeo.MapGuide.ExtendedObjectModels;
 
-
 namespace Maestro.AddIn.ExtendedObjectModels.Commands
 {
     public class StartupCommand : AbstractCommand
@@ -34,4 +32,4 @@
             ModelSetup.Initialize();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Editor/EditorFactories.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Editor/EditorFactories.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Editor/EditorFactories.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Base.Editor;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 
@@ -98,7 +98,7 @@
         public IEditorViewContent Create()
         {
             //Use the same 1.0.0 editor for now
-            return new LayerDefinitionEditor(); 
+            return new LayerDefinitionEditor();
         }
     }
 
@@ -275,4 +275,4 @@
             return new SymbolDefinitionEditor();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Manifest.addin
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Manifest.addin	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Manifest.addin	2014-12-25 08:20:40 UTC (rev 8459)
@@ -61,4 +61,4 @@
     <Path name="/Workspace/Autostart">
         <Class id="Startup" class="Maestro.AddIn.ExtendedObjectModels.Commands.StartupCommand" />
     </Path>
-</AddIn>
+</AddIn>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Maestro.AddIn.ExtendedObjectModels")]
@@ -11,10 +10,10 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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("34257625-dc58-45af-b117-c3a8bda007c8")]
+[assembly: Guid("34257625-dc58-45af-b117-c3a8bda007c8")]
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition230ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition230ItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition230ItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Base.Templates;
-using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
 using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Generic;
 using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using System;
+using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
 
 namespace Maestro.AddIn.ExtendedObjectModels.Templates
 {
@@ -53,4 +52,4 @@
             return ObjectFactory.CreateMapDefinition(conn, new Version(2, 3, 0), string.Empty);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition240ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition240ItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition240ItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Base.Templates;
-using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
 using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Generic;
 using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using System;
+using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
 
 namespace Maestro.AddIn.ExtendedObjectModels.Templates
 {
@@ -53,4 +52,4 @@
             return ObjectFactory.CreateMapDefinition(conn, new Version(2, 4, 0), string.Empty);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SQLiteLoadProcedureItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SQLiteLoadProcedureItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SQLiteLoadProcedureItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,38 +1,36 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Base.Templates;
-using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Generic;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using Maestro.Shared.UI;
-using OSGeo.MapGuide.ObjectModels.LoadProcedure;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.ObjectModels.LoadProcedure;
+using System;
 
 namespace Maestro.AddIn.ExtendedObjectModels.Templates
 {
-    internal class SQLiteLoadProcedureItemTemplate  : ItemTemplate
+    internal class SQLiteLoadProcedureItemTemplate : ItemTemplate
     {
         public SQLiteLoadProcedureItemTemplate()
         {
@@ -75,4 +73,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SymbolDefinition110ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SymbolDefinition110ItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SymbolDefinition110ItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Base.Templates;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
-using Maestro.Base.Templates;
+using System;
+using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
 
 namespace Maestro.AddIn.ExtendedObjectModels.Templates
 {
@@ -78,4 +78,4 @@
             return ObjectFactory.CreateCompoundSymbol(conn, new Version(1, 1, 0), Strings.DefaultSymbolName, Strings.DefaultSymbolDescription);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SymbolDefinition240ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SymbolDefinition240ItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SymbolDefinition240ItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Base.Templates;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
-using Maestro.Base.Templates;
+using System;
+using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
 
 namespace Maestro.AddIn.ExtendedObjectModels.Templates
 {
@@ -78,4 +78,4 @@
             return ObjectFactory.CreateCompoundSymbol(conn, new Version(2, 4, 0), Strings.DefaultSymbolName, Strings.DefaultSymbolDescription);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer110ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer110ItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer110ItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Base.Templates;
-using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
+using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Generic;
+using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.ObjectModels;
+using System;
+using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
 
 namespace Maestro.AddIn.ExtendedObjectModels.Templates
 {
@@ -71,4 +72,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer120ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer120ItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer120ItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Base.Templates;
-using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
+using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Generic;
+using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.ObjectModels;
+using System;
+using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
 
 namespace Maestro.AddIn.ExtendedObjectModels.Templates
 {
@@ -71,4 +72,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer130ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer130ItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer130ItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Base.Templates;
-using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
+using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Generic;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using System;
+using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
 
 namespace Maestro.AddIn.ExtendedObjectModels.Templates
 {
@@ -71,4 +72,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer230ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer230ItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer230ItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Base.Templates;
-using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
+using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Generic;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using System;
+using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
 
 namespace Maestro.AddIn.ExtendedObjectModels.Templates
 {
@@ -71,4 +72,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer240ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer240ItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer240ItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Base.Templates;
-using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
+using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Generic;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using System;
+using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
 
 namespace Maestro.AddIn.ExtendedObjectModels.Templates
 {
@@ -71,4 +72,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition230ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition230ItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition230ItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Base.Templates;
-using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
 using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Generic;
 using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
+using System;
+using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
 
 namespace Maestro.AddIn.ExtendedObjectModels.Templates
 {
@@ -80,4 +78,4 @@
             return ObjectFactory.CreateWatermark(conn, SymbolDefinitionType.Compound, new Version(2, 3, 0));
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition240ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition240ItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition240ItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Base.Templates;
-using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
 using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Generic;
 using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
+using System;
+using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
 
 namespace Maestro.AddIn.ExtendedObjectModels.Templates
 {
@@ -80,4 +78,4 @@
             return ObjectFactory.CreateWatermark(conn, SymbolDefinitionType.Compound, new Version(2, 4, 0));
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout110ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout110ItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout110ItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Base.Templates;
-using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
-using OSGeo.MapGuide.MaestroAPI;
 using Maestro.Editors.Generic;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels;
+using System;
+using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
 
 namespace Maestro.AddIn.ExtendedObjectModels.Templates
 {
@@ -66,4 +65,4 @@
             return null;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout240ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout240ItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout240ItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Base.Templates;
-using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
-using OSGeo.MapGuide.MaestroAPI;
 using Maestro.Editors.Generic;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels;
+using System;
+using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
 
 namespace Maestro.AddIn.ExtendedObjectModels.Templates
 {
@@ -66,4 +65,4 @@
             return null;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout260ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout260ItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout260ItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,32 @@
 #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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Base.Templates;
-using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
-using OSGeo.MapGuide.MaestroAPI;
 using Maestro.Editors.Generic;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels;
+using System;
+using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
 
 namespace Maestro.AddIn.ExtendedObjectModels.Templates
 {
@@ -66,4 +65,4 @@
             return null;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/app.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/app.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly>
+                <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
 </configuration>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Commands/StartupCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Commands/StartupCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Commands/StartupCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
-using Maestro.Base;
-using Maestro.Base.Services;
-using Maestro.Shared.UI;
 
 namespace Maestro.AddIn.FdoToolbox.Commands
 {
@@ -31,7 +28,6 @@
     {
         public override void Run()
         {
-
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Manifest.addin
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Manifest.addin	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Manifest.addin	2014-12-25 08:20:40 UTC (rev 8459)
@@ -17,4 +17,4 @@
     <Path name="/Workspace/Autostart">
         <Class id="Startup" class="Maestro.AddIn.FdoToolbox.Commands.StartupCommand" />
     </Path>
-</AddIn>
+</AddIn>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Maestro.AddIn.FdoToolbox")]
@@ -11,10 +10,10 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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("1d41a9ea-b61e-45f4-8e17-9ac4571062fa")]
+[assembly: Guid("1d41a9ea-b61e-45f4-8e17-9ac4571062fa")]
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/app.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/app.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly>
+                <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
 </configuration>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/ConnectionPoolStatusCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/ConnectionPoolStatusCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/ConnectionPoolStatusCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
+using Maestro.AddIn.Local.UI;
 using OSGeo.MapGuide;
-using Maestro.AddIn.Local.UI;
 
 namespace Maestro.AddIn.Local.Commands
 {
@@ -37,4 +37,4 @@
             new ConnectionPoolStatusDialog(br).ShowDialog();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/StartupCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/StartupCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Commands/StartupCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Local;
-using System.IO;
-using Maestro.Base.Services;
 using Maestro.AddIn.Local.Services;
-using OSGeo.MapGuide;
 using Maestro.Editors.Preview;
+using OSGeo.MapGuide;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Local;
+using System;
 
 namespace Maestro.AddIn.Local.Commands
 {
@@ -50,7 +49,7 @@
             }
         }
 
-        void OnAppExit(object sender, EventArgs e)
+        private void OnAppExit(object sender, EventArgs e)
         {
             try
             {
@@ -62,4 +61,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Manifest.addin
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Manifest.addin	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Manifest.addin	2014-12-25 08:20:40 UTC (rev 8459)
@@ -24,7 +24,7 @@
         <MenuItem id="LocalConnectionPoolStatus"
                   insertbefore="CacheView"
                   label="${res:LocalConnectionPoolStatus}"
-                  class="Maestro.AddIn.Local.Commands.ConnectionPoolStatusCommand"/>
+                  class="Maestro.AddIn.Local.Commands.ConnectionPoolStatusCommand" />
       </Condition>
     </Path>
-</AddIn>
+</AddIn>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Maestro.AddIn.Local")]
@@ -11,8 +10,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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)]
 

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Services/LocalPreviewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Services/LocalPreviewer.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Services/LocalPreviewer.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,36 +1,35 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Maestro.Base.Services;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide;
-using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.MaestroAPI.Resource;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors;
 using Maestro.Editors.Preview;
+using OSGeo.MapGuide;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
+using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
+using System;
 
 namespace Maestro.AddIn.Local.Services
 {
@@ -104,4 +103,4 @@
             diag.ShowDialog();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/UI/ConnectionPoolStatusDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/UI/ConnectionPoolStatusDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/UI/ConnectionPoolStatusDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
+using System.IO;
 using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide;
 using System.Xml;
-using System.IO;
 
 namespace Maestro.AddIn.Local.UI
 {
@@ -84,6 +83,5 @@
             //return the formatted xml
             return sb.ToString();
         }
-
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,38 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide;
-using System.IO;
-using System.Diagnostics;
-using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using OSGeo.MapGuide.Viewer;
-using ICSharpCode.Core;
 using OSGeo.MapGuide.Viewer.Desktop;
+using System;
+using System.Windows.Forms;
 
 namespace Maestro.AddIn.Local.UI
 {
@@ -72,7 +65,7 @@
             viewer.RefreshMap();
         }
 
-        void OnDisposed(object sender, EventArgs e)
+        private void OnDisposed(object sender, EventArgs e)
         {
             if (_map != null)
             {
@@ -110,4 +103,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/UI/ZoomScaleDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/UI/ZoomScaleDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/UI/ZoomScaleDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.AddIn.Local.UI
@@ -51,4 +49,4 @@
             this.DialogResult = DialogResult.OK;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/app.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/app.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly>
+                <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
 </configuration>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/packages.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/packages.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="mapguide-api-base-x86" version="2.5.2.7949" targetFramework="net40" />
-  <package id="mg-desktop-net40-x86" version="2.5.2.7949" targetFramework="net40" />
-  <package id="mg-desktop-viewer-net40-x86" version="2.5.2.7949" targetFramework="net40" />
+    <package id="mapguide-api-base-x86" version="2.5.2.7949" targetFramework="net40" />
+    <package id="mg-desktop-net40-x86" version="2.5.2.7949" targetFramework="net40" />
+    <package id="mg-desktop-viewer-net40-x86" version="2.5.2.7949" targetFramework="net40" />
 </packages>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/Commands/StartupCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/Commands/StartupCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Commands/StartupCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,15 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using ICSharpCode.Core;
-using Maestro.Base;
+using ICSharpCode.Core;
 using Maestro.AddIn.Scripting.UI;
-using Maestro.Shared.UI;
+using Maestro.Base;
 using Maestro.Base.Services;
+using Maestro.Shared.UI;
 using Props = ICSharpCode.Core.PropertyService;
-using Maestro.Base.UI.Preferences;
-using ICSharpCode.TextEditor.Document;
 
 namespace Maestro.AddIn.Scripting.Commands
 {
@@ -32,10 +26,10 @@
 
         private IronPythonRepl _repl;
 
-        void OnWorkbenchClosed(object sender, System.Windows.Forms.FormClosedEventArgs e)
+        private void OnWorkbenchClosed(object sender, System.Windows.Forms.FormClosedEventArgs e)
         {
             if (_repl != null)
                 _repl.Shutdown();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/CommandLineHistory.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/CommandLineHistory.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/CommandLineHistory.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -13,26 +14,26 @@
 //  email: office at alphasierrapapa.com
 //  court of jurisdiction: Landesgericht Leoben
 //
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Maestro.AddIn.Scripting.Lang.Python
 {
@@ -41,8 +42,8 @@
     /// </summary>
     internal class CommandLineHistory
     {
-        List<string> lines = new List<string>();
-        int position;
+        private List<string> lines = new List<string>();
+        private int position;
 
         public CommandLineHistory()
         {
@@ -117,4 +118,4 @@
             return position >= 0;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/IMemberProvider.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/IMemberProvider.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/IMemberProvider.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -13,26 +14,25 @@
 //  email: office at alphasierrapapa.com
 //  court of jurisdiction: Landesgericht Leoben
 //
-// 
+//
 // 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
-using System;
+//
+
+#endregion Disclaimer / License
+
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Maestro.AddIn.Scripting.Lang.Python
 {
@@ -45,4 +45,4 @@
 
         IList<string> GetGlobals(string name);
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/PythonConsole.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/PythonConsole.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/PythonConsole.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -13,22 +14,24 @@
 //  email: office at alphasierrapapa.com
 //  court of jurisdiction: Landesgericht Leoben
 //
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.TextEditor.Document;
 using Maestro.AddIn.Scripting.Services;
 using Maestro.Editors.Common;
@@ -37,8 +40,6 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Windows.Forms;
 
@@ -46,15 +47,15 @@
 {
     internal class PythonConsole : IConsole, IDisposable, IMemberProvider
     {
-        ITextEditor textEditor;
-        int lineReceivedEventIndex = 0; // The index into the waitHandles array where the lineReceivedEvent is stored.
-        ManualResetEvent lineReceivedEvent = new ManualResetEvent(false);
-        ManualResetEvent disposedEvent = new ManualResetEvent(false);
-        WaitHandle[] waitHandles;
-        int promptLength;
-        List<string> previousLines = new List<string>();
-        CommandLine commandLine;
-        CommandLineHistory commandLineHistory = new CommandLineHistory();
+        private ITextEditor textEditor;
+        private int lineReceivedEventIndex = 0; // The index into the waitHandles array where the lineReceivedEvent is stored.
+        private ManualResetEvent lineReceivedEvent = new ManualResetEvent(false);
+        private ManualResetEvent disposedEvent = new ManualResetEvent(false);
+        private WaitHandle[] waitHandles;
+        private int promptLength;
+        private List<string> previousLines = new List<string>();
+        private CommandLine commandLine;
+        private CommandLineHistory commandLineHistory = new CommandLineHistory();
 
         public CommandLine CommandLine { get { return this.commandLine; } }
 
@@ -82,16 +83,16 @@
         {
             get
             {
-            #if DEBUG
+#if DEBUG
                 Console.WriteLine("PythonConsole.Output get");
-            #endif
+#endif
                 return null;
             }
             set
             {
-            #if DEBUG
+#if DEBUG
                 Console.WriteLine("PythonConsole.Output set");
-            #endif
+#endif
             }
         }
 
@@ -99,16 +100,16 @@
         {
             get
             {
-            #if DEBUG
+#if DEBUG
                 Console.WriteLine("PythonConsole.ErrorOutput get");
-            #endif
+#endif
                 return null;
             }
             set
             {
-            #if DEBUG
+#if DEBUG
                 Console.WriteLine("PythonConsole.ErrorOutput get");
-            #endif
+#endif
             }
         }
 
@@ -131,9 +132,9 @@
         /// </summary>
         public string ReadLine(int autoIndentSize)
         {
-        #if DEBUG
+#if DEBUG
             Console.WriteLine("PythonConsole.ReadLine(): autoIndentSize: " + autoIndentSize);
-        #endif
+#endif
             string indent = String.Empty;
             if (autoIndentSize > 0)
             {
@@ -144,9 +145,9 @@
             string line = ReadLineFromTextEditor();
             if (line != null)
             {
-            #if DEBUG
+#if DEBUG
                 Console.WriteLine("ReadLine: " + indent + line);
-            #endif
+#endif
                 return indent + line;
             }
             return null;
@@ -159,9 +160,9 @@
         /// </summary>
         public void Write(string text, Style style)
         {
-        #if DEBUG
+#if DEBUG
             Console.WriteLine("PythonConsole.Write(text, style): " + text);
-        #endif
+#endif
             if (style == Style.Error)
                 textEditor.Write(text, Color.Red, Color.White);
             else if (style == Style.Warning)
@@ -232,12 +233,12 @@
             return previousLines.ToArray();
         }
 
-        string GetLastTextEditorLine()
+        private string GetLastTextEditorLine()
         {
             return textEditor.GetLine(textEditor.TotalLines - 1);
         }
 
-        string ReadLineFromTextEditor()
+        private string ReadLineFromTextEditor()
         {
             int result = WaitHandle.WaitAny(waitHandles);
             if (result == lineReceivedEventIndex)
@@ -259,7 +260,7 @@
         /// <summary>
         /// Processes characters entered into the text editor by the user.
         /// </summary>
-        bool ProcessKeyPress(char ch)
+        private bool ProcessKeyPress(char ch)
         {
             if (IsInReadOnlyRegion)
             {
@@ -281,7 +282,7 @@
         /// <summary>
         /// Process dialog keys such as the enter key when typed into the editor by the user.
         /// </summary>
-        bool ProcessDialogKeyPress(Keys keyData)
+        private bool ProcessDialogKeyPress(Keys keyData)
         {
             if (textEditor.ProcessKeyPress(keyData))
                 return true;
@@ -300,6 +301,7 @@
                     case Keys.Up:
                     case Keys.Down:
                         return false;
+
                     default:
                         return true;
                 }
@@ -309,12 +311,15 @@
             {
                 case Keys.Back:
                     return !CanBackspace;
+
                 case Keys.Home:
                     MoveToHomePosition();
                     return true;
+
                 case Keys.Down:
                     MoveToNextCommandLine();
                     return true;
+
                 case Keys.Up:
                     MoveToPreviousCommandLine();
                     return true;
@@ -325,7 +330,7 @@
         /// <summary>
         /// Move cursor to the end of the line before retrieving the line.
         /// </summary>
-        void OnEnterKeyPressed()
+        private void OnEnterKeyPressed()
         {
             lock (previousLines)
             {
@@ -344,7 +349,7 @@
         /// <summary>
         /// Returns true if the cursor is in a readonly text editor region.
         /// </summary>
-        bool IsInReadOnlyRegion
+        private bool IsInReadOnlyRegion
         {
             get { return IsCurrentLineReadOnly || IsInPrompt; }
         }
@@ -352,7 +357,7 @@
         /// <summary>
         /// Only the last line in the text editor is not read only.
         /// </summary>
-        bool IsCurrentLineReadOnly
+        private bool IsCurrentLineReadOnly
         {
             get { return textEditor.Line < textEditor.TotalLines - 1; }
         }
@@ -360,7 +365,7 @@
         /// <summary>
         /// Determines whether the current cursor position is in a prompt.
         /// </summary>
-        bool IsInPrompt
+        private bool IsInPrompt
         {
             get { return textEditor.Column - promptLength < 0; }
         }
@@ -368,7 +373,7 @@
         /// <summary>
         /// Returns true if the user can backspace at the current cursor position.
         /// </summary>
-        bool CanBackspace
+        private bool CanBackspace
         {
             get
             {
@@ -378,7 +383,7 @@
             }
         }
 
-        void ShowCompletionWindow()
+        private void ShowCompletionWindow()
         {
             PythonConsoleCompletionDataProvider completionProvider = new PythonConsoleCompletionDataProvider(this);
             textEditor.ShowCompletionWindow(completionProvider);
@@ -387,7 +392,7 @@
         /// <summary>
         /// The home position is at the start of the line after the prompt.
         /// </summary>
-        void MoveToHomePosition()
+        private void MoveToHomePosition()
         {
             textEditor.Column = promptLength;
         }
@@ -395,7 +400,7 @@
         /// <summary>
         /// Shows the previous command line in the command line history.
         /// </summary>
-        void MoveToPreviousCommandLine()
+        private void MoveToPreviousCommandLine()
         {
             if (commandLineHistory.MovePrevious())
             {
@@ -406,7 +411,7 @@
         /// <summary>
         /// Shows the next command line in the command line history.
         /// </summary>
-        void MoveToNextCommandLine()
+        private void MoveToNextCommandLine()
         {
             if (commandLineHistory.MoveNext())
             {
@@ -417,7 +422,7 @@
         /// <summary>
         /// Replaces the current line text after the prompt with the specified text.
         /// </summary>
-        void ReplaceCurrentLineTextAfterPrompt(string text)
+        private void ReplaceCurrentLineTextAfterPrompt(string text)
         {
             string currentLine = GetCurrentLine();
             textEditor.Replace(promptLength, currentLine.Length, text);
@@ -426,4 +431,4 @@
             textEditor.Column = promptLength + text.Length;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/PythonConsoleCompletionDataProvider.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/PythonConsoleCompletionDataProvider.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/PythonConsoleCompletionDataProvider.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -13,30 +14,30 @@
 //  email: office at alphasierrapapa.com
 //  court of jurisdiction: Landesgericht Leoben
 //
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.TextEditor;
 using ICSharpCode.TextEditor.Document;
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
 
 namespace Maestro.AddIn.Scripting.Lang.Python
 {
@@ -45,7 +46,7 @@
     /// </summary>
     internal class PythonConsoleCompletionDataProvider : ICompletionDataProvider
     {
-        IMemberProvider memberProvider;
+        private IMemberProvider memberProvider;
 
         public PythonConsoleCompletionDataProvider(IMemberProvider memberProvider)
         {
@@ -89,7 +90,7 @@
             return items.ToArray();
         }
 
-        string GetName(string text)
+        private string GetName(string text)
         {
             //Assume compacted expressions, meaning we need to take into account operators and non-whitespace tokens
             //TODO: Still imperfect. A dot after a function expression brings up nothing. But a dot after a named variable will
@@ -103,7 +104,7 @@
         /// <summary>
         /// Gets the line of text up to the cursor position.
         /// </summary>
-        string GetLineText(TextArea textArea)
+        private string GetLineText(TextArea textArea)
         {
             LineSegment lineSegment = textArea.Document.GetLineSegmentForOffset(textArea.Caret.Offset);
             return textArea.Document.GetText(lineSegment);
@@ -165,4 +166,4 @@
             return data.InsertAction(textArea, key);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/PythonConsoleHost.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/PythonConsoleHost.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/PythonConsoleHost.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -13,34 +14,32 @@
 //  email: office at alphasierrapapa.com
 //  court of jurisdiction: Landesgericht Leoben
 //
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using IronPython.Hosting;
 using IronPython.Runtime;
-using Maestro.AddIn.Scripting.Services;
-using Maestro.AddIn.Scripting.UI;
 using Maestro.Editors.Common;
 using Microsoft.Scripting.Hosting;
 using Microsoft.Scripting.Hosting.Providers;
 using Microsoft.Scripting.Hosting.Shell;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Threading;
 
@@ -51,9 +50,9 @@
     /// </summary>
     internal class PythonConsoleHost : ConsoleHost, IDisposable
     {
-        Thread thread;
-        ITextEditor textEditor;
-        PythonConsole pythonConsole;
+        private Thread thread;
+        private ITextEditor textEditor;
+        private PythonConsole pythonConsole;
 
         public PythonConsole Console { get { return pythonConsole; } }
 
@@ -148,9 +147,9 @@
         /// <summary>
         /// Runs the console.
         /// </summary>
-        void RunConsole()
+        private void RunConsole()
         {
             Run(new string[0]);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/PythonOutputStream.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/PythonOutputStream.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/PythonOutputStream.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -13,34 +14,33 @@
 //  email: office at alphasierrapapa.com
 //  court of jurisdiction: Landesgericht Leoben
 //
-// 
+//
 // 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
-using System;
-using System.Collections.Generic;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
 using System.IO;
-using System.Linq;
 using System.Text;
-using Maestro.Editors.Common;
 
 namespace Maestro.AddIn.Scripting.Lang.Python
 {
     internal class PythonOutputStream : Stream
     {
-        ITextEditor textEditor;
+        private ITextEditor textEditor;
 
         public PythonOutputStream(ITextEditor textEditor)
         {
@@ -100,4 +100,4 @@
             textEditor.Write(text);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/Manifest.addin
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/Manifest.addin	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Manifest.addin	2014-12-25 08:20:40 UTC (rev 8459)
@@ -27,4 +27,4 @@
     <Path name="/Maestro/Shell/SingleViewContent">
         <Class id="IronPythonRepl" class="Maestro.AddIn.Scripting.UI.IronPythonRepl" />
     </Path>
-</AddIn>
+</AddIn>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Maestro.AddIn.Scripting")]
@@ -11,8 +10,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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)]
 

Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/ScriptingConfigProperties.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/ScriptingConfigProperties.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/ScriptingConfigProperties.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using Props = ICSharpCode.Core.PropertyService;
 
 namespace Maestro.AddIn.Scripting
 {
@@ -58,4 +56,4 @@
         /// </summary>
         public const string ShowIronPythonConsole = "Scripting.ShowIronPythonConsole"; //NOXLATE
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/Services/ScriptingClasses.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/Services/ScriptingClasses.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Services/ScriptingClasses.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,41 +1,38 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Maestro.Shared.UI;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
-using OSGeo.MapGuide.MaestroAPI;
 using Maestro.Base;
+using Maestro.Base.Editor;
 using Maestro.Base.Services;
-using System.IO;
 using Maestro.Editors.Common;
-using Microsoft.Scripting.Hosting.Shell;
-using Microsoft.Scripting.Runtime;
-using Microsoft.Scripting.Hosting;
-using Maestro.AddIn.Scripting.UI;
 using Maestro.Editors.Generic;
-using Maestro.Base.Editor;
-using Microsoft.Scripting.Hosting.Providers;
 using Maestro.Editors.Preview;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
 
 namespace Maestro.AddIn.Scripting.Services
 {
@@ -318,4 +315,4 @@
             this.MainWindow.Invoke(method);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronPythonPreferences.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronPythonPreferences.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronPythonPreferences.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Base.UI.Preferences;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 using Props = ICSharpCode.Core.PropertyService;
-using Maestro.Base.UI.Preferences;
 
 namespace Maestro.AddIn.Scripting.UI
 {
@@ -57,8 +54,6 @@
             get { return this; }
         }
 
-        
-
         public bool ApplyChanges()
         {
             bool restart = false;
@@ -88,4 +83,4 @@
             Props.Set(ScriptingConfigProperties.IronPythonModulePath, ScriptingConfigProperties.DefaultIronPythonModulePath);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronPythonRepl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronPythonRepl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronPythonRepl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,21 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
+using Maestro.Editors.Common;
 using Maestro.Shared.UI;
-using ICSharpCode.TextEditor.Document;
-using System.IO;
-using Maestro.Editors.Common;
 using Microsoft.Scripting.Hosting.Shell;
+using System;
+using System.Windows.Forms;
 
 namespace Maestro.AddIn.Scripting.UI
 {
-    using Lang.Python;
     using ICSharpCode.Core;
+    using Lang.Python;
 
     internal partial class IronPythonRepl : SingletonViewContent
     {
@@ -63,7 +55,7 @@
             base.OnLoad(e);
         }
 
-        void OnDisposed(object sender, EventArgs e)
+        private void OnDisposed(object sender, EventArgs e)
         {
             if (host != null)
             {
@@ -117,4 +109,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/app.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/app.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly>
+                <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
 </configuration>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/packages.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/packages.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="IronPython" version="2.7.4" targetFramework="net40" />
-  <package id="IronPython.StdLib" version="2.7.4" targetFramework="net40" />
+    <package id="IronPython" version="2.7.4" targetFramework="net40" />
+    <package id="IronPython.StdLib" version="2.7.4" targetFramework="net40" />
 </packages>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddInManager/AboutForm.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/AboutForm.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddInManager/AboutForm.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,95 +1,103 @@
 // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
+using ICSharpCode.Core;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 
-using ICSharpCode.Core;
-
 namespace ICSharpCode.AddInManager
 {
     using Str = Maestro.AddInManager.Strings;
 
     public class AboutForm : System.Windows.Forms.Form
     {
-        Font boldFont;
-        
+        private Font boldFont;
+
         public AboutForm(AddIn addIn)
         {
             //
             // The InitializeComponent() call is required for Windows Forms designer support.
             //
             InitializeComponent();
-            
+
             boldFont = new Font(Font, FontStyle.Bold);
-            
+
             List<string> titles = new List<string>();
             List<string> values = new List<string>();
-            
+
             this.Text = addIn.Name;
             closeButton.Text = ResourceService.GetString("Global.CloseButtonText"); //NOXLATE
-            
+
             titles.Add(Str.TitleAddInFile);
             values.Add(addIn.Name);
-            
-            if (addIn.Manifest.PrimaryVersion != null && addIn.Manifest.PrimaryVersion.ToString() != "0.0.0.0") {
+
+            if (addIn.Manifest.PrimaryVersion != null && addIn.Manifest.PrimaryVersion.ToString() != "0.0.0.0")
+            {
                 titles.Add(Str.TitleVersion);
                 values.Add(addIn.Manifest.PrimaryVersion.ToString());
             }
-            
-            if (addIn.Properties["author"].Length > 0) {
+
+            if (addIn.Properties["author"].Length > 0)
+            {
                 titles.Add(Str.TitleAuthor);
                 values.Add(addIn.Properties["author"]);
             }
-            
-            if (addIn.Properties["copyright"].Length > 0) {
-                if (!addIn.Properties["copyright"].StartsWith("prj:")) {
+
+            if (addIn.Properties["copyright"].Length > 0)
+            {
+                if (!addIn.Properties["copyright"].StartsWith("prj:"))
+                {
                     titles.Add(Str.TitleCopyright);
                     values.Add(addIn.Properties["copyright"]);
                 }
             }
-            
-            if (addIn.Properties["license"].Length > 0) {
+
+            if (addIn.Properties["license"].Length > 0)
+            {
                 titles.Add(Str.TitleLicense);
                 values.Add(addIn.Properties["license"]);
             }
-            
-            if (addIn.Properties["url"].Length > 0) {
+
+            if (addIn.Properties["url"].Length > 0)
+            {
                 titles.Add(Str.TitleWebsite);
                 values.Add(addIn.Properties["url"]);
             }
-            
-            if (addIn.Properties["description"].Length > 0) {
+
+            if (addIn.Properties["description"].Length > 0)
+            {
                 titles.Add(Str.TitleDescription);
                 values.Add(addIn.Properties["description"]);
             }
-            
+
             titles.Add(Str.TitleAddInFile);
             values.Add(FileUtility.NormalizePath(addIn.FileName));
-            
+
             titles.Add(Str.TitleInternalName);
             values.Add(addIn.Manifest.PrimaryIdentity);
-            
+
             table.RowCount = titles.Count + 1;
             table.RowStyles.Clear();
-            for (int i = 0; i < titles.Count; i++) {
+            for (int i = 0; i < titles.Count; i++)
+            {
                 table.RowStyles.Add(new RowStyle(SizeType.AutoSize));
                 AddRow(titles[i], values[i], i);
             }
         }
-        
+
         protected override void Dispose(bool disposing)
         {
             base.Dispose(disposing);
-            if (disposing) {
+            if (disposing)
+            {
                 if (boldFont != null)
                     boldFont.Dispose();
             }
         }
-        
-        void AddRow(string desc, string val, int rowIndex)
+
+        private void AddRow(string desc, string val, int rowIndex)
         {
             Label descLabel = new Label();
             descLabel.AutoSize = true;
@@ -97,32 +105,40 @@
             descLabel.Font = boldFont;
             descLabel.Text = StringParser.Parse(desc) + ":"; //NOXLATE
             table.Controls.Add(descLabel, 0, rowIndex);
-            
+
             Label valLabel;
             string link = GetLink(val);
-            if (link != null) {
+            if (link != null)
+            {
                 LinkLabel linkLabel = new LinkLabel();
-                linkLabel.LinkClicked += delegate {
-                    try {
+                linkLabel.LinkClicked += delegate
+                {
+                    try
+                    {
                         System.Diagnostics.Process.Start(link);
-                    } catch (Exception ex) {
+                    }
+                    catch (Exception ex)
+                    {
                         MessageService.ShowMessage(ex.ToString());
                     }
                 };
                 valLabel = linkLabel;
-            } else {
+            }
+            else
+            {
                 valLabel = new Label();
             }
             valLabel.AutoSize = true;
             valLabel.Text = val;
             table.Controls.Add(valLabel, 1, rowIndex);
         }
-        
-        string GetLink(string text)
+
+        private string GetLink(string text)
         {
             if (text == null)
                 return null;
-            switch (text) {
+            switch (text)
+            {
                 case "GNU General Public License": //NOXLATE
                 case "GPL": //NOXLATE
                     return "http://www.gnu.org/licenses/gpl.html"; //NOXLATE
@@ -137,8 +153,9 @@
                     return null;
             }
         }
-        
+
         #region Windows Forms Designer generated code
+
         /// <summary>
         /// This method is required for Windows Forms designer support.
         /// Do not change the method contents inside the source code editor. The Forms designer might
@@ -152,18 +169,18 @@
             bottomPanel = new System.Windows.Forms.Panel();
             bottomPanel.SuspendLayout();
             this.SuspendLayout();
-            // 
+            //
             // bottomPanel
-            // 
+            //
             bottomPanel.Controls.Add(this.closeButton);
             bottomPanel.Dock = System.Windows.Forms.DockStyle.Bottom;
             bottomPanel.Location = new System.Drawing.Point(0, 233);
             bottomPanel.Name = "bottomPanel";
             bottomPanel.Size = new System.Drawing.Size(351, 35);
             bottomPanel.TabIndex = 0;
-            // 
+            //
             // closeButton
-            // 
+            //
             this.closeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.closeButton.Location = new System.Drawing.Point(264, 6);
             this.closeButton.Name = "closeButton";
@@ -173,9 +190,9 @@
             this.closeButton.UseCompatibleTextRendering = true;
             this.closeButton.UseVisualStyleBackColor = true;
             this.closeButton.Click += new System.EventHandler(this.CloseButtonClick);
-            // 
+            //
             // table
-            // 
+            //
             this.table.ColumnCount = 2;
             this.table.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
             this.table.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
@@ -187,9 +204,9 @@
             this.table.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
             this.table.Size = new System.Drawing.Size(351, 225);
             this.table.TabIndex = 1;
-            // 
+            //
             // AboutForm
-            // 
+            //
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Info;
@@ -206,13 +223,15 @@
             bottomPanel.ResumeLayout(false);
             this.ResumeLayout(false);
         }
+
         private System.Windows.Forms.Button closeButton;
         private System.Windows.Forms.TableLayoutPanel table;
-        #endregion
-        
-        void CloseButtonClick(object sender, EventArgs e)
+
+        #endregion Windows Forms Designer generated code
+
+        private void CloseButtonClick(object sender, EventArgs e)
         {
             Close();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddInManager/AddInControl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/AddInControl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddInManager/AddInControl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,39 +1,40 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
+using ICSharpCode.Core.WinForms;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using ICSharpCode.Core;
+using System.ComponentModel;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Windows.Forms;
-using System.ComponentModel;
-using ICSharpCode.Core.WinForms;
 
 namespace Maestro.AddInManager
 {
     [ToolboxItem(false)]
     public class AddInControl : Control
     {
-        AddIn addIn;
-        bool isExternal;
+        private AddIn addIn;
+        private bool isExternal;
 
         public AddIn AddIn
         {
@@ -60,7 +61,7 @@
             this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
         }
 
-        bool selected;
+        private bool selected;
 
         public bool Selected
         {
@@ -84,7 +85,7 @@
             Focus();
         }
 
-        Color Mix(Color c1, Color c2, double perc)
+        private Color Mix(Color c1, Color c2, double perc)
         {
             double p1 = 1 - perc;
             double p2 = perc;
@@ -177,9 +178,9 @@
             }
         }
 
-        const int pathHeight = 10;
+        private const int pathHeight = 10;
 
-        string GetText(out Brush textBrush)
+        private string GetText(out Brush textBrush)
         {
             switch (addIn.Action)
             {
@@ -218,10 +219,11 @@
                 case AddInAction.CustomError:
                     textBrush = Brushes.Red;
                     return StringParser.Parse(addIn.CustomErrorMessage);
+
                 default:
                     textBrush = Brushes.Yellow;
                     return addIn.Action.ToString();
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddInManager/AddInManger.addin
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/AddInManger.addin	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddInManager/AddInManger.addin	2014-12-25 08:20:40 UTC (rev 8459)
@@ -10,66 +10,65 @@
 
     <Runtime>
         <Import assembly="Maestro.AddInManager.dll">
-            <ConditionEvaluator name="AddInManagerAddInState" class="Maestro.AddInManager.AddInManagerAddInStateConditionEvaluator"/>
+            <ConditionEvaluator name="AddInManagerAddInState" class="Maestro.AddInManager.AddInManagerAddInStateConditionEvaluator" />
         </Import>
     </Runtime>
 
     <Path name = "/Workspace/Tools">
         <MenuItem id = "ShowAddInManager"
 		          label = "${res:CMD_AddInManager}"
-                  icon = "plugin" 
-                  insertbefore="PrefSeparator" 
-		          class = "Maestro.AddInManager.ShowCommand"/>
+                  icon = "plugin"
+                  insertbefore="PrefSeparator"
+		          class = "Maestro.AddInManager.ShowCommand" />
     </Path>
 
     <Path name="/Workbench/Toolbar">
         <MenuItem id = "ShowAddInManager"
                   icon = "plugin"
-                  tooltip="${res:CMD_AddInManager}" 
-		          class = "Maestro.AddInManager.ShowCommand"/>
+                  tooltip="${res:CMD_AddInManager}"
+		          class = "Maestro.AddInManager.ShowCommand" />
     </Path>
 
     <Path name = "/AddIns/AddInManager/ContextMenu">
         <Condition name="AddInManagerAddInState" states="Enable">
             <MenuItem id="Disable"
 			          label="${res:AddInManager.ActionDisable}"
-			          class="Maestro.AddInManager.DisableCommand"/>
+			          class="Maestro.AddInManager.DisableCommand" />
         </Condition>
         <Condition name="AddInManagerAddInState" states="Disable">
             <MenuItem id="Enable"
 			          label="${res:AddInManager.ActionEnable}"
-			          class="Maestro.AddInManager.EnableCommand"/>
+			          class="Maestro.AddInManager.EnableCommand" />
         </Condition>
         <Condition name="AddInManagerAddInState" states="Enable,Disable,InstalledTwice,DependencyError">
             <MenuItem id="Uninstall"
 			          label="${res:AddInManager.ActionUninstall}"
-			          class="Maestro.AddInManager.UninstallCommand"/>
+			          class="Maestro.AddInManager.UninstallCommand" />
         </Condition>
         <Condition name="AddInManagerAddInState" states="Install">
             <MenuItem id="AbortInstall"
 			          label="${res:AddInManager.ActionCancelInstallation}"
-			          class="Maestro.AddInManager.AbortInstallCommand"/>
+			          class="Maestro.AddInManager.AbortInstallCommand" />
         </Condition>
         <Condition name="AddInManagerAddInState" states="Uninstall">
             <MenuItem id="AbortUninstall"
 			          label="${res:AddInManager.ActionCancelDeinstallation}"
-			          class="Maestro.AddInManager.EnableCommand"/>
+			          class="Maestro.AddInManager.EnableCommand" />
         </Condition>
         <Condition name="AddInManagerAddInState" states="Update">
             <MenuItem id="AbortUpdate"
 			          label="${res:AddInManager.ActionCancelUpdate}"
-			          class="Maestro.AddInManager.AbortUpdateCommand"/>
+			          class="Maestro.AddInManager.AbortUpdateCommand" />
         </Condition>
-        <MenuItem id="Separator1" type="Separator"/>
+        <MenuItem id="Separator1" type="Separator" />
         <MenuItem id="GoToHomepage"
 		          label="${res:AddInManager.OpenWebsite}"
 		          class="Maestro.AddInManager.OpenHomepageCommand"
-		          loadclasslazy="false"/>
+		          loadclasslazy="false" />
     </Path>
-    
+
     <!-- Auto-start commands -->
     <Path name="/Workspace/Autostart">
         <Class id="Startup" class="Maestro.AddInManager.StartupCommand" />
     </Path>
-    
-</AddIn>
+</AddIn>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddInManager/Commands.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/Commands.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddInManager/Commands.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 
 namespace Maestro.AddInManager
@@ -107,10 +107,12 @@
 
         public override void Run()
         {
-            try {
+            try
+            {
                 System.Diagnostics.Process.Start(((AddInControl)Owner).AddIn.Properties["url"]); //NOXLATE
-            } catch {}
+            }
+            catch { }
             ManagerForm.Instance.Close();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddInManager/InstallableAddIn.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/InstallableAddIn.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddInManager/InstallableAddIn.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,36 +1,37 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using ICSharpCode.SharpZipLib.Zip;
+using System.Collections.Generic;
 using System.IO;
 
 namespace Maestro.AddInManager
 {
     public class InstallableAddIn
     {
-        string fileName;
-        bool isPackage;
-        AddIn addIn;
+        private string fileName;
+        private bool isPackage;
+        private AddIn addIn;
 
         public AddIn AddIn
         {
@@ -64,7 +65,7 @@
                 throw new AddInLoadException(ResourceService.GetString("AddInManager.AddInMustHaveIdentity"));
         }
 
-        void LoadAddInFromZip(ZipFile file)
+        private void LoadAddInFromZip(ZipFile file)
         {
             ZipEntry addInEntry = null;
             foreach (ZipEntry entry in file)
@@ -159,4 +160,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddInManager/ManagerForm.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/ManagerForm.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddInManager/ManagerForm.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,38 +1,42 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
+using ICSharpCode.Core.WinForms;
 using System;
 using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
 using System.Text;
 using System.Windows.Forms;
-using ICSharpCode.Core;
-using System.Drawing;
-using System.IO;
-using ICSharpCode.Core.WinForms;
 
 namespace Maestro.AddInManager
 {
     public class ManagerForm : System.Windows.Forms.Form
     {
         #region Form Initialization
-        static ManagerForm instance;
 
+        private static ManagerForm instance;
+
         public static ManagerForm Instance
         {
             get
@@ -71,7 +75,7 @@
             CreateAddInList();
         }
 
-        void OnSplitContainerPanel1Paint(object sender, PaintEventArgs e)
+        private void OnSplitContainerPanel1Paint(object sender, PaintEventArgs e)
         {
             if (visibleAddInCount == 0)
             {
@@ -83,7 +87,7 @@
             }
         }
 
-        void CreateAddInList()
+        private void CreateAddInList()
         {
             Stack<AddInControl> stack = new Stack<AddInControl>();
             int index = 0;
@@ -117,7 +121,7 @@
             splitContainer.Panel2Collapsed = true;
         }
 
-        void RefreshAddInList()
+        private void RefreshAddInList()
         {
             List<AddIn> oldSelected = selected;
             foreach (Control ctl in splitContainer.Panel1.Controls)
@@ -136,12 +140,14 @@
             }
             UpdateActionBox();
         }
-        #endregion
 
+        #endregion Form Initialization
+
         #region AddInList-Management
-        int visibleAddInCount = 0;
 
-        void ShowPreinstalledAddInsCheckBoxCheckedChanged(object sender, EventArgs e)
+        private int visibleAddInCount = 0;
+
+        private void ShowPreinstalledAddInsCheckBoxCheckedChanged(object sender, EventArgs e)
         {
             visibleAddInCount = 0;
             foreach (AddInControl ctl in splitContainer.Panel1.Controls)
@@ -165,7 +171,7 @@
             UpdateActionBox();
         }
 
-        void OnControlClick(object sender, EventArgs e)
+        private void OnControlClick(object sender, EventArgs e)
         {
             // clicking again on already focused item:
             // remove selection of other items / or with Ctrl: toggle selection
@@ -173,10 +179,10 @@
                 OnControlEnter(sender, e);
         }
 
-        AddInControl oldFocus;
-        bool ignoreFocusChange;
+        private AddInControl oldFocus;
+        private bool ignoreFocusChange;
 
-        void OnControlEnter(object sender, EventArgs e)
+        private void OnControlEnter(object sender, EventArgs e)
         {
             if (ignoreFocusChange)
                 return;
@@ -220,20 +226,22 @@
             }
             UpdateActionBox();
         }
-        #endregion
 
+        #endregion AddInList-Management
+
         #region UpdateActionBox
-        List<AddIn> selected;
-        AddInAction selectedAction;
 
-        static bool IsErrorAction(AddInAction action)
+        private List<AddIn> selected;
+        private AddInAction selectedAction;
+
+        private static bool IsErrorAction(AddInAction action)
         {
             return action == AddInAction.DependencyError
                 || action == AddInAction.InstalledTwice
                 || action == AddInAction.CustomError;
         }
 
-        void UpdateActionBox()
+        private void UpdateActionBox()
         {
             ignoreFocusChange = true;
             selected = new List<AddIn>();
@@ -336,14 +344,14 @@
             ignoreFocusChange = false;
         }
 
-        enum ShowDependencyMode
+        private enum ShowDependencyMode
         {
             Disable,
             Enable,
             CancelUpdate
         }
 
-        bool ShowDependencies(IList<AddIn> addIns, ShowDependencyMode mode)
+        private bool ShowDependencies(IList<AddIn> addIns, ShowDependencyMode mode)
         {
             List<AddInReference> dependencies = new List<AddInReference>(); // only used with enable=true
             List<KeyValuePair<AddIn, AddInReference>> dependenciesToSel = new List<KeyValuePair<AddIn, AddInReference>>();
@@ -457,7 +465,7 @@
             return allDepenciesOK;
         }
 
-        bool AddDependencyRow(Dictionary<string, Version> addInDict, AddInReference dep, int rowIndex, string requiredByName)
+        private bool AddDependencyRow(Dictionary<string, Version> addInDict, AddInReference dep, int rowIndex, string requiredByName)
         {
             string text = requiredByName ?? GetDisplayName(dep.Name);
             Version versionFound;
@@ -475,7 +483,7 @@
             return isOK;
         }
 
-        void AddLabelRow(int rowIndex, string text)
+        private void AddLabelRow(int rowIndex, string text)
         {
             Label label = new Label();
             label.AutoSize = true;
@@ -484,7 +492,7 @@
             dependencyTable.SetColumnSpan(label, 2);
         }
 
-        string GetDisplayName(string identity)
+        private string GetDisplayName(string identity)
         {
             foreach (AddIn addIn in AddInTree.AddIns)
             {
@@ -493,10 +501,12 @@
             }
             return identity;
         }
-        #endregion
 
+        #endregion UpdateActionBox
+
         #region Install new AddIns
-        void InstallButtonClick(object sender, EventArgs e)
+
+        private void InstallButtonClick(object sender, EventArgs e)
         {
             using (OpenFileDialog dlg = new OpenFileDialog())
             {
@@ -536,10 +546,12 @@
                             }
                             list.Add(new InstallableAddIn(file, false));
                             break;
+
                         case ".sdaddin": //NOXLATE
                         case ".zip": //NOXLATE
                             list.Add(new InstallableAddIn(file, true));
                             break;
+
                         default:
                             MessageService.ShowMessage("${res:AddInManager.UnknownFileFormat} " + Path.GetExtension(file)); //NOXLATE
                             return false;
@@ -555,9 +567,9 @@
             return true;
         }
 
-        IList<InstallableAddIn> shownAddInPackages;
+        private IList<InstallableAddIn> shownAddInPackages;
 
-        void ShowInstallableAddIns(IList<InstallableAddIn> addInPackages)
+        private void ShowInstallableAddIns(IList<InstallableAddIn> addInPackages)
         {
             shownAddInPackages = addInPackages;
             ignoreFocusChange = true;
@@ -631,7 +643,7 @@
             runActionButton.Enabled = ShowDependencies(addInList, ShowDependencyMode.Enable);
         }
 
-        void RunInstallation()
+        private void RunInstallation()
         {
             // install new AddIns
             foreach (InstallableAddIn addInPackage in shownAddInPackages)
@@ -665,19 +677,23 @@
             }
             RefreshAddInList();
         }
-        #endregion
 
+        #endregion Install new AddIns
+
         #region Uninstall AddIns
-        void UninstallButtonClick(object sender, EventArgs e)
+
+        private void UninstallButtonClick(object sender, EventArgs e)
         {
             ICSharpCode.Core.AddInManager.RemoveExternalAddIns(selected);
             InstallableAddIn.Uninstall(selected);
             RefreshAddInList();
         }
-        #endregion
 
+        #endregion Uninstall AddIns
+
         #region Drag'N'Drop
-        void Panel1DragEnter(object sender, DragEventArgs e)
+
+        private void Panel1DragEnter(object sender, DragEventArgs e)
         {
             if (!e.Data.GetDataPresent(DataFormats.FileDrop))
             {
@@ -694,10 +710,12 @@
                     case ".addin": //NOXLATE
                         addInCount += 1;
                         break;
+
                     case ".sdaddin": //NOXLATE
                     case ".zip": //NOXLATE
                         packageCount += 1;
                         break;
+
                     default:
                         e.Effect = DragDropEffects.None;
                         return;
@@ -717,15 +735,16 @@
             }
         }
 
-        void Panel1DragDrop(object sender, DragEventArgs e)
+        private void Panel1DragDrop(object sender, DragEventArgs e)
         {
             if (!e.Data.GetDataPresent(DataFormats.FileDrop))
                 return;
             ShowInstallableAddIns((string[])e.Data.GetData(DataFormats.FileDrop));
         }
-        #endregion
 
-        void CloseButtonClick(object sender, EventArgs e)
+        #endregion Drag'N'Drop
+
+        private void CloseButtonClick(object sender, EventArgs e)
         {
             Close();
         }
@@ -758,7 +777,7 @@
                 uninstallButton.PerformClick();
         }
 
-        void RunActionButtonClick(object sender, EventArgs e)
+        private void RunActionButtonClick(object sender, EventArgs e)
         {
             switch (selectedAction)
             {
@@ -773,15 +792,19 @@
                     }
                     ICSharpCode.Core.AddInManager.Disable(selected);
                     break;
+
                 case AddInAction.Enable:
                     ICSharpCode.Core.AddInManager.Enable(selected);
                     break;
+
                 case AddInAction.Install:
                     RunInstallation();
                     return;
+
                 case AddInAction.Uninstall:
                     UninstallButtonClick(sender, e);
                     return;
+
                 case AddInAction.InstalledTwice: // used to cancel installation of update
                     InstallableAddIn.CancelUpdate(selected);
                     foreach (AddIn addIn in selected)
@@ -789,6 +812,7 @@
                         addIn.Action = addIn.Enabled ? AddInAction.Enable : AddInAction.Disable;
                     }
                     break;
+
                 default:
                     throw new NotImplementedException();
             }
@@ -800,6 +824,7 @@
         }
 
         #region Windows Forms Designer generated code
+
         /// <summary>
         /// This method is required for Windows Forms designer support.
         /// Do not change the method contents inside the source code editor. The Forms designer might
@@ -828,18 +853,18 @@
             this.actionFlowLayoutPanel.SuspendLayout();
             this.dependencyTable.SuspendLayout();
             this.SuspendLayout();
-            // 
+            //
             // topPanel
-            // 
+            //
             this.topPanel.Dock = System.Windows.Forms.DockStyle.Top;
             this.topPanel.Location = new System.Drawing.Point(0, 0);
             this.topPanel.Name = "topPanel";
             this.topPanel.Size = new System.Drawing.Size(460, 33);
             this.topPanel.TabIndex = 1;
             this.topPanel.Visible = false;
-            // 
+            //
             // bottomPanel
-            // 
+            //
             this.bottomPanel.Controls.Add(this.installButton);
             this.bottomPanel.Controls.Add(this.closeButton);
             this.bottomPanel.Controls.Add(this.showPreinstalledAddInsCheckBox);
@@ -848,9 +873,9 @@
             this.bottomPanel.Name = "bottomPanel";
             this.bottomPanel.Size = new System.Drawing.Size(460, 35);
             this.bottomPanel.TabIndex = 0;
-            // 
+            //
             // installButton
-            // 
+            //
             this.installButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.installButton.Location = new System.Drawing.Point(274, 6);
             this.installButton.Name = "installButton";
@@ -860,9 +885,9 @@
             this.installButton.UseCompatibleTextRendering = true;
             this.installButton.UseVisualStyleBackColor = true;
             this.installButton.Click += new System.EventHandler(this.InstallButtonClick);
-            // 
+            //
             // closeButton
-            // 
+            //
             this.closeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.closeButton.Location = new System.Drawing.Point(373, 6);
             this.closeButton.Name = "closeButton";
@@ -872,9 +897,9 @@
             this.closeButton.UseCompatibleTextRendering = true;
             this.closeButton.UseVisualStyleBackColor = true;
             this.closeButton.Click += new System.EventHandler(this.CloseButtonClick);
-            // 
+            //
             // showPreinstalledAddInsCheckBox
-            // 
+            //
             this.showPreinstalledAddInsCheckBox.Location = new System.Drawing.Point(3, 6);
             this.showPreinstalledAddInsCheckBox.Name = "showPreinstalledAddInsCheckBox";
             this.showPreinstalledAddInsCheckBox.Size = new System.Drawing.Size(169, 24);
@@ -883,34 +908,34 @@
             this.showPreinstalledAddInsCheckBox.UseCompatibleTextRendering = true;
             this.showPreinstalledAddInsCheckBox.UseVisualStyleBackColor = true;
             this.showPreinstalledAddInsCheckBox.CheckedChanged += new System.EventHandler(this.ShowPreinstalledAddInsCheckBoxCheckedChanged);
-            // 
+            //
             // splitContainer
-            // 
+            //
             this.splitContainer.BackColor = System.Drawing.SystemColors.Window;
             this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
             this.splitContainer.Location = new System.Drawing.Point(0, 33);
             this.splitContainer.Name = "splitContainer";
-            // 
+            //
             // splitContainer.Panel1
-            // 
+            //
             this.splitContainer.Panel1.AllowDrop = true;
             this.splitContainer.Panel1.AutoScroll = true;
             this.splitContainer.Panel1.DragDrop += new System.Windows.Forms.DragEventHandler(this.Panel1DragDrop);
             this.splitContainer.Panel1.DragEnter += new System.Windows.Forms.DragEventHandler(this.Panel1DragEnter);
             this.splitContainer.Panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.OnSplitContainerPanel1Paint);
             this.splitContainer.Panel1MinSize = 100;
-            // 
+            //
             // splitContainer.Panel2
-            // 
+            //
             this.splitContainer.Panel2.Controls.Add(this.actionGroupBox);
             this.splitContainer.Panel2MinSize = 100;
             this.splitContainer.Size = new System.Drawing.Size(460, 322);
             this.splitContainer.SplitterDistance = 248;
             this.splitContainer.TabIndex = 2;
-            // 
+            //
             // actionGroupBox
-            // 
+            //
             this.actionGroupBox.Controls.Add(this.actionFlowLayoutPanel);
             this.actionGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.actionGroupBox.Location = new System.Drawing.Point(0, 0);
@@ -920,9 +945,9 @@
             this.actionGroupBox.TabStop = false;
             this.actionGroupBox.Text = "actionGroupBox";
             this.actionGroupBox.UseCompatibleTextRendering = true;
-            // 
+            //
             // actionFlowLayoutPanel
-            // 
+            //
             this.actionFlowLayoutPanel.AutoScroll = true;
             this.actionFlowLayoutPanel.Controls.Add(this.actionDescription);
             this.actionFlowLayoutPanel.Controls.Add(this.dependencyTable);
@@ -936,9 +961,9 @@
             this.actionFlowLayoutPanel.Size = new System.Drawing.Size(202, 302);
             this.actionFlowLayoutPanel.TabIndex = 0;
             this.actionFlowLayoutPanel.WrapContents = false;
-            // 
+            //
             // actionDescription
-            // 
+            //
             this.actionDescription.AutoSize = true;
             this.actionDescription.Location = new System.Drawing.Point(3, 0);
             this.actionDescription.Name = "actionDescription";
@@ -946,9 +971,9 @@
             this.actionDescription.TabIndex = 0;
             this.actionDescription.Text = "actionDescription";
             this.actionDescription.UseCompatibleTextRendering = true;
-            // 
+            //
             // dependencyTable
-            // 
+            //
             this.dependencyTable.AutoSize = true;
             this.dependencyTable.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
             this.dependencyTable.ColumnCount = 2;
@@ -963,9 +988,9 @@
             this.dependencyTable.RowStyles.Add(new System.Windows.Forms.RowStyle());
             this.dependencyTable.Size = new System.Drawing.Size(55, 36);
             this.dependencyTable.TabIndex = 1;
-            // 
+            //
             // dummyLabel1
-            // 
+            //
             this.dummyLabel1.AutoSize = true;
             this.dummyLabel1.Location = new System.Drawing.Point(23, 0);
             this.dummyLabel1.Name = "dummyLabel1";
@@ -973,9 +998,9 @@
             this.dummyLabel1.TabIndex = 0;
             this.dummyLabel1.Text = "dep1";
             this.dummyLabel1.UseCompatibleTextRendering = true;
-            // 
+            //
             // dummyLabel2
-            // 
+            //
             this.dummyLabel2.AutoSize = true;
             this.dummyLabel2.Location = new System.Drawing.Point(23, 18);
             this.dummyLabel2.Name = "dummyLabel2";
@@ -983,9 +1008,9 @@
             this.dummyLabel2.TabIndex = 1;
             this.dummyLabel2.Text = "dep2";
             this.dummyLabel2.UseCompatibleTextRendering = true;
-            // 
+            //
             // runActionButton
-            // 
+            //
             this.runActionButton.AutoSize = true;
             this.runActionButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
             this.runActionButton.Location = new System.Drawing.Point(3, 63);
@@ -997,9 +1022,9 @@
             this.runActionButton.UseCompatibleTextRendering = true;
             this.runActionButton.UseVisualStyleBackColor = true;
             this.runActionButton.Click += new System.EventHandler(this.RunActionButtonClick);
-            // 
+            //
             // uninstallButton
-            // 
+            //
             this.uninstallButton.AutoSize = true;
             this.uninstallButton.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
             this.uninstallButton.Location = new System.Drawing.Point(3, 94);
@@ -1011,9 +1036,9 @@
             this.uninstallButton.UseCompatibleTextRendering = true;
             this.uninstallButton.UseVisualStyleBackColor = true;
             this.uninstallButton.Click += new System.EventHandler(this.UninstallButtonClick);
-            // 
+            //
             // ManagerForm
-            // 
+            //
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(460, 390);
@@ -1034,6 +1059,7 @@
             this.dependencyTable.PerformLayout();
             this.ResumeLayout(false);
         }
+
         private System.Windows.Forms.Label dummyLabel2;
         private System.Windows.Forms.Label dummyLabel1;
         private System.Windows.Forms.CheckBox showPreinstalledAddInsCheckBox;
@@ -1048,6 +1074,7 @@
         private System.Windows.Forms.SplitContainer splitContainer;
         private System.Windows.Forms.Panel bottomPanel;
         private System.Windows.Forms.Panel topPanel;
-        #endregion
+
+        #endregion Windows Forms Designer generated code
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddInManager/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddInManager/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,12 +1,11 @@
 #region Using directives
 
-using System;
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-#endregion
+#endregion Using directives
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Maestro.AddInManager")]
@@ -17,4 +16,4 @@
 
 // This sets the default COM visibility of types in the assembly to invisible.
 // If you need to expose a type to COM, use [ComVisible(true)] on that type.
-[assembly: ComVisible(false)]
+[assembly: ComVisible(false)]
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddInManager/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/packages.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.AddInManager/packages.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net40-Client" />
+    <package id="SharpZipLib" version="0.86.0" targetFramework="net40-Client" />
 </packages>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/AboutCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/AboutCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/AboutCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
+using Maestro.Base.Services;
 using Maestro.Base.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Base.Services;
 
 namespace Maestro.Base.Commands
 {
@@ -42,4 +42,4 @@
             diag.ShowDialog();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/CacheViewerCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/CacheViewerCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/CacheViewerCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Editors.Diagnostics;
+using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI.Commands;
-using Maestro.Shared.UI;
+using System;
 
 namespace Maestro.Base.Commands
 {
@@ -47,4 +48,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/CloseActiveDocumentCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/CloseActiveDocumentCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/CloseActiveDocumentCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 
 namespace Maestro.Base.Commands
@@ -36,4 +36,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/CloseAllDocumentsCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/CloseAllDocumentsCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/CloseAllDocumentsCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 
@@ -36,4 +36,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ActiveEditorConditionEvaluator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ActiveEditorConditionEvaluator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ActiveEditorConditionEvaluator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Editor;
 
@@ -42,14 +42,19 @@
                     {
                         case "CANPREVIEW": //NOXLATE
                             return ed != null && ed.CanBePreviewed;
+
                         case "CANVALIDATE": //NOXLATE
                             return ed != null && ed.CanBeValidated;
+
                         case "CANSAVE": //NOXLATE
                             return ed != null && !ed.IsNew && ed.IsDirty;
+
                         case "CANPROFILE": //NOXLATE
                             return ed != null && ed.CanProfile;
+
                         case "CANEDITASXML": //NOXLATE
                             return ed != null && ed.CanEditAsXml;
+
                         default:
                             return false;
                     }
@@ -62,4 +67,4 @@
             return false;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ActiveEditorTypeConditionEvaluator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ActiveEditorTypeConditionEvaluator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ActiveEditorTypeConditionEvaluator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
 using System.Collections.Generic;
-using System.Text;
-using ICSharpCode.Core;
-using Maestro.Base.Editor;
 
 namespace Maestro.Base.Commands.Conditions
 {
@@ -46,4 +46,4 @@
             return false;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/CloseableDocumentConditionEvaluator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/CloseableDocumentConditionEvaluator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/CloseableDocumentConditionEvaluator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 
 namespace Maestro.Base.Commands.Conditions
@@ -37,4 +37,4 @@
             return false;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ConnectionProviderConditionEvaluator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ConnectionProviderConditionEvaluator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ConnectionProviderConditionEvaluator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 
@@ -39,4 +39,4 @@
             return false;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/CutCopyConditionEvaluator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/CutCopyConditionEvaluator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/CutCopyConditionEvaluator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 
 namespace Maestro.Base.Commands.Conditions
@@ -40,4 +40,4 @@
             return false;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/DebugModeConditionEvaluator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/DebugModeConditionEvaluator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/DebugModeConditionEvaluator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 
 namespace Maestro.Base.Commands.Conditions
@@ -35,4 +35,4 @@
 #endif
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/MultipleSelectedItemConditionEvaluator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/MultipleSelectedItemConditionEvaluator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/MultipleSelectedItemConditionEvaluator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 
 namespace Maestro.Base.Commands.Conditions
@@ -36,4 +36,4 @@
             return false;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/NonZeroDocumentConditionEvaluator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/NonZeroDocumentConditionEvaluator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/NonZeroDocumentConditionEvaluator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 
@@ -33,4 +33,4 @@
             return omgr.OpenEditors.Length > 0;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/NotConnectedConditionEvaluator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/NotConnectedConditionEvaluator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/NotConnectedConditionEvaluator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 
 namespace Maestro.Base.Commands.Conditions
@@ -40,4 +40,4 @@
             return false;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/PasteConditionEvaluator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/PasteConditionEvaluator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/PasteConditionEvaluator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 
@@ -33,4 +33,4 @@
             return svc.HasContent();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ResourceTypeConditionEvaluator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ResourceTypeConditionEvaluator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/ResourceTypeConditionEvaluator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
 using System.Collections.Generic;
-using System.Text;
-using ICSharpCode.Core;
 
 namespace Maestro.Base.Commands.Conditions
 {
@@ -52,4 +53,4 @@
             return false;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/SelectedItemConditionEvaluator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/SelectedItemConditionEvaluator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/SelectedItemConditionEvaluator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 
 namespace Maestro.Base.Commands.Conditions
@@ -48,4 +48,4 @@
             return false;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/SelectedRootItemConditionEvaluator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/SelectedRootItemConditionEvaluator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/SelectedRootItemConditionEvaluator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 
 namespace Maestro.Base.Commands.Conditions
@@ -40,4 +40,4 @@
             return true;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/SupportedCommandConditionEvaluator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/SupportedCommandConditionEvaluator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Conditions/SupportedCommandConditionEvaluator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using OSGeo.MapGuide.MaestroAPI.Commands;
+using System;
 
 namespace Maestro.Base.Commands.Conditions
 {
@@ -43,7 +44,7 @@
                     int[] caps = conn.Capabilities.SupportedCommands;
                     foreach (var cmdName in cmds)
                     {
-                        try 
+                        try
                         {
                             CommandType cmd = (CommandType)Enum.Parse(typeof(CommandType), cmdName);
                             if (Array.IndexOf(caps, (int)cmd) < 0)
@@ -57,4 +58,4 @@
             return false;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/CopyCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/CopyCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/CopyCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Base.UI;
 using OSGeo.MapGuide.MaestroAPI;
+using System.Collections.Generic;
 
 namespace Maestro.Base.Commands
 {
@@ -96,4 +97,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/CreatePackageCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/CreatePackageCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/CreatePackageCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
-using Maestro.Base.UI.Packaging;
 using Maestro.Base.Services;
+using Maestro.Base.UI.Packaging;
 using Maestro.Packaging;
-using Maestro.Shared.UI;
 
 namespace Maestro.Base.Commands
 {
@@ -75,4 +74,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/CutCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/CutCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/CutCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Base.UI;
+using System.Collections.Generic;
 
 namespace Maestro.Base.Commands
 {
@@ -89,4 +90,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/EditAsXmlCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/EditAsXmlCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/EditAsXmlCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Editor;
+using Maestro.Editors.Generic;
 using System.Windows.Forms;
-using Maestro.Editors.Generic;
 
 namespace Maestro.Base.Commands
 {
@@ -50,4 +50,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/EditPackageCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/EditPackageCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/EditPackageCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
-using Maestro.Shared.UI;
 using Maestro.Base.Services;
 using Maestro.Editors.Packaging;
+using Maestro.Shared.UI;
 
 namespace Maestro.Base.Commands
 {
@@ -47,4 +47,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/LiveMapEditorCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/LiveMapEditorCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/LiveMapEditorCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.UI.Preferences;
-using System.IO;
 using Maestro.Shared.UI;
 using System.Diagnostics;
+using System.IO;
 
 namespace Maestro.Base.Commands
 {
@@ -54,4 +53,4 @@
             var proc = Process.Start(procInfo);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/LoadPackageCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/LoadPackageCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/LoadPackageCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
+using Maestro.Packaging;
 using Maestro.Shared.UI;
-using Maestro.Packaging;
 using System.Windows.Forms;
 
 namespace Maestro.Base.Commands
@@ -63,4 +63,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/LocalFeatureSourcePreviewCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/LocalFeatureSourcePreviewCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/LocalFeatureSourcePreviewCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.UI.Preferences;
-using System.IO;
 using Maestro.Shared.UI;
 using System.Diagnostics;
+using System.IO;
 
 namespace Maestro.Base.Commands
 {
@@ -53,4 +53,4 @@
             var proc = Process.Start(procInfo);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/LoginCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/LoginCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/LoginCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
-using Maestro.Login;
-using ICSharpCode.Core.Services;
 using Maestro.Base.Services;
-using System.Diagnostics;
 using Maestro.Base.UI;
-using Maestro.Base.Editor;
+using Maestro.Login;
+using System.Diagnostics;
 
 namespace Maestro.Base.Commands
 {
@@ -73,4 +71,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/MgCookerCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/MgCookerCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/MgCookerCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
+using Maestro.Base.UI.Preferences;
+using Maestro.Shared.UI;
 using System.Diagnostics;
 using System.IO;
-using Maestro.Shared.UI;
-using Maestro.Base.UI.Preferences;
 
 namespace Maestro.Base.Commands
 {
@@ -35,7 +35,7 @@
             RunCooker();
         }
 
-        internal static void RunCooker(params string [] args)
+        internal static void RunCooker(params string[] args)
         {
             string exe = PropertyService.Get(ConfigProperties.MgCookerPath, string.Empty); //NOXLATE
 
@@ -59,4 +59,4 @@
             var proc = Process.Start(procInfo);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/NewItemCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/NewItemCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/NewItemCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
+using Maestro.Base.Services;
 using Maestro.Base.UI;
-using Maestro.Base.Services;
-using OSGeo.MapGuide.MaestroAPI.Resource;
+using System;
 
 namespace Maestro.Base.Commands
 {
@@ -68,4 +68,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/NotImplementedCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/NotImplementedCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/NotImplementedCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using ICSharpCode.Core;
 
 namespace Maestro.Base.Commands
 {
@@ -31,4 +32,4 @@
             throw new NotImplementedException();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/OpenResourceIdCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/OpenResourceIdCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/OpenResourceIdCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Base.UI;
@@ -56,4 +55,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/OptionsCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/OptionsCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/OptionsCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.UI.Preferences;
 using System.Windows.Forms;
@@ -43,4 +43,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/PasteCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/PasteCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/PasteCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Linq;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
-using Maestro.Editors;
 using Maestro.Base.Services;
 using Maestro.Base.UI;
+using Maestro.Editors;
 using OSGeo.MapGuide.MaestroAPI.Resource;
-using Maestro.Shared.UI;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Maestro.Base.Commands
 {
@@ -57,7 +58,7 @@
 
             var folder = exp.SelectedItems[0];
             var sourceItemsNotMoved = new List<string>();
-            
+
             //.net FX 2.0 hack to compensate for lack of set collection
             Dictionary<string, string> folders = new Dictionary<string, string>();
             var notPasted = new List<RepositoryItem>();
@@ -69,7 +70,7 @@
                 {
                     LoggingService.InfoFormatted(Strings.ClipboardAction, item.ClipboardState, item.ResourceId, folder.ResourceId);
 
-                    //Keep testing until we find a target resource identifier that 
+                    //Keep testing until we find a target resource identifier that
                     //doesn't already exists. Note this would automatically guard against any resources in this folder
                     //that may already be open in an editor
                     var rid = new ResourceIdentifier(item.ResourceId);
@@ -171,4 +172,4 @@
             return new RepositoryItem[0];
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/PreviewResourceCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/PreviewResourceCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/PreviewResourceCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
-using Maestro.Base.Services;
 
 namespace Maestro.Base.Commands
 {
@@ -31,7 +30,7 @@
         {
             var wb = Workbench.Instance;
             var ed = wb.ActiveEditor;
-            
+
             if (ed != null && ed.CanBePreviewed)
             {
                 //TODO: This needs to be reviewed when we decide to support
@@ -45,4 +44,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/ProfileResourceCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/ProfileResourceCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/ProfileResourceCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
+using Maestro.Base.Services;
 using Maestro.Base.UI;
-using Maestro.Base.Services;
 
 namespace Maestro.Base.Commands
 {
@@ -43,4 +43,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/QuitCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/QuitCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/QuitCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Commands.SiteExplorer;
 
@@ -36,4 +36,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/RtMapInspectorCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/RtMapInspectorCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/RtMapInspectorCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.UI.Preferences;
 using Maestro.Shared.UI;
+using System.Diagnostics;
 using System.IO;
-using System.Diagnostics;
 
 namespace Maestro.Base.Commands
 {
@@ -53,4 +53,4 @@
             var proc = Process.Start(procInfo);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SaveAllCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SaveAllCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SaveAllCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 
@@ -39,4 +39,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SaveResourceAsCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SaveResourceAsCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SaveResourceAsCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Editor;
+using Maestro.Base.Services;
+using Maestro.Editors.Generic;
 using Maestro.Shared.UI;
-using Maestro.Editors.Generic;
-using Maestro.Base.Services;
 using OSGeo.MapGuide.MaestroAPI.Resource;
+using System;
 
 namespace Maestro.Base.Commands
 {
@@ -38,7 +39,7 @@
             var omgr = ServiceRegistry.GetService<OpenResourceManager>();
             var ed = wb.ActiveDocumentView as IEditorViewContent;
             var conn = ed.EditorService.GetEditedResource().CurrentConnection;
-            
+
             if (ed != null)
             {
                 using (var picker = new ResourcePicker(conn, ed.Resource.ResourceType, ResourcePickerMode.SaveResource))
@@ -80,4 +81,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SaveResourceCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SaveResourceCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SaveResourceCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Editor;
 using Maestro.Shared.UI;
@@ -48,4 +48,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/ServerMonitorCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/ServerMonitorCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/ServerMonitorCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
-using OSGeo.MapGuide.MaestroAPI.Services;
 using Maestro.Editors.Diagnostics;
 using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using System;
 
 namespace Maestro.Base.Commands
 {
@@ -56,4 +57,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteAdministratorCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteAdministratorCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteAdministratorCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using System.Diagnostics;
@@ -44,4 +44,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CompareResourceCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CompareResourceCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CompareResourceCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +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
-// 
-#endregion
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Editors.Diff;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Maestro.Base.Commands.SiteExplorer
 {
@@ -47,4 +46,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CompileFullDependencyListCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CompileFullDependencyListCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CompileFullDependencyListCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Base.UI;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.ObjectModels.Common;
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Text;
 using System.Xml;
 
 namespace Maestro.Base.Commands.SiteExplorer
@@ -86,7 +86,7 @@
             }
         }
 
-        class DependencySet
+        private class DependencySet
         {
             public DependencySet(ICollection<string> selResources, ICollection<string> downRefs, ICollection<string> upRefs)
             {
@@ -96,7 +96,9 @@
             }
 
             public ICollection<string> SelectedResources { get; private set; }
+
             public ICollection<string> DownstreamDependencies { get; private set; }
+
             public ICollection<string> UpstreamDependencies { get; private set; }
         }
 
@@ -109,7 +111,7 @@
             {
                 wrk.ReportProgress(pe.Progress, o);
             };
-            
+
             var upRefs = new HashSet<string>();
             var downRefs = new HashSet<string>();
             var selResources = new HashSet<string>();
@@ -124,4 +126,4 @@
             return new DependencySet(selResources, downRefs, upRefs);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CopyMoveToAnotherServerCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CopyMoveToAnotherServerCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CopyMoveToAnotherServerCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
+using Maestro.Editors.Migration;
 using Maestro.Login;
-using Maestro.Editors.Migration;
-using OSGeo.MapGuide.MaestroAPI.CrossConnection;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.CrossConnection;
+using System.Collections.Generic;
 
 namespace Maestro.Base.Commands.SiteExplorer
 {
@@ -96,6 +97,7 @@
                     case MigrationAction.Copy:
                         affected = migrator.CopyResources(ids, folder, overwrite, cb);
                         break;
+
                     case MigrationAction.Move:
                         affected = migrator.MoveResources(ids, folder, overwrite, cb);
                         break;
@@ -106,4 +108,4 @@
             return (int)diag.RunOperationAsync(Workbench.Instance, method, source, target, migrate.SourceResourceIds, migrate.TargetFolder, migrate.OverwriteResources, migrate.SelectedAction);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CopyResourceIdCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CopyResourceIdCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CopyResourceIdCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using ICSharpCode.Core;
 
 namespace Maestro.Base.Commands.SiteExplorer
 {
@@ -46,4 +48,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CreateLayersFromFeatureSourceCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CreateLayersFromFeatureSourceCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CreateLayersFromFeatureSourceCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Editors.FeatureSource;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Schema;
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 
 namespace Maestro.Base.Commands.SiteExplorer
 {
@@ -51,7 +51,7 @@
             }
         }
 
-        static object DoBackgroundWorker(BackgroundWorker wrk, DoWorkEventArgs e, params object[] args)
+        private static object DoBackgroundWorker(BackgroundWorker wrk, DoWorkEventArgs e, params object[] args)
         {
             var items = (List<ClassDefinition>)args[0];
             var conn = (IServerConnection)args[1];
@@ -78,7 +78,7 @@
             return result;
         }
 
-        static void CreateLayers(IServerConnection conn, string featureSource, string targetFolder, string[] featureClasses)
+        private static void CreateLayers(IServerConnection conn, string featureSource, string targetFolder, string[] featureClasses)
         {
             var wb = Workbench.Instance;
             List<ClassDefinition> classes = new List<ClassDefinition>();
@@ -96,4 +96,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DeleteSelectedItemsCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DeleteSelectedItemsCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DeleteSelectedItemsCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
+using Maestro.Base.UI;
 using Maestro.Shared.UI;
-using Maestro.Base.UI;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Maestro.Base.Commands.SiteExplorer
 {
@@ -219,4 +220,4 @@
             pdlg.RunOperationAsync(wb, work, items);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DisconnectCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DisconnectCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DisconnectCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 
@@ -73,4 +72,4 @@
             return false;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DuplicateResourceCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DuplicateResourceCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DuplicateResourceCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Base.UI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
+using System.Collections.Generic;
 
 namespace Maestro.Base.Commands.SiteExplorer
 {
@@ -50,7 +51,7 @@
 
                 foreach (var item in toDuplicate)
                 {
-                    //Keep testing until we find a target resource identifier that 
+                    //Keep testing until we find a target resource identifier that
                     //doesn't already exists. Note this would automatically guard against any resources in this folder
                     //that may already be open in an editor
                     var rid = new ResourceIdentifier(item.ResourceId);
@@ -82,4 +83,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/EditResourceHeaderCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/EditResourceHeaderCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/EditResourceHeaderCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Base.UI;
-using OSGeo.MapGuide.ObjectModels.Common;
 
 namespace Maestro.Base.Commands.SiteExplorer
 {
@@ -64,4 +63,4 @@
             return conn.Capabilities.SupportsResourceHeaders;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ExtractSymbolsCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ExtractSymbolsCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ExtractSymbolsCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,22 +1,25 @@
 #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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Editors.SymbolDefinition;
@@ -63,13 +66,13 @@
         private object SymbolExtractionWorker(BackgroundWorker worker, DoWorkEventArgs e, params object[] args)
         {
             int processed = 0;
-            IServerConnection conn  = (IServerConnection)args[0];
-            string symbolLib        = (string)args[1];
-            List<string> symbols    = (List<string>)args[2];
-            string targetFolder     = (string)args[3];
+            IServerConnection conn = (IServerConnection)args[0];
+            string symbolLib = (string)args[1];
+            List<string> symbols = (List<string>)args[2];
+            string targetFolder = (string)args[3];
 
             ImageSymbolConverter conv = new ImageSymbolConverter(conn, symbolLib);
-            conv.ExtractSymbols(targetFolder, symbols, (count, total) => 
+            conv.ExtractSymbols(targetFolder, symbols, (count, total) =>
             {
                 processed = count;
                 int pc = (int)((double)count / (double)total);
@@ -88,4 +91,4 @@
             diag.RunOperationAsync(wb, worker, conn, symbolLib, list, targetFolder);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/FindReplaceXmlContentCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/FindReplaceXmlContentCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/FindReplaceXmlContentCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
+using Maestro.Base.Editor;
 using Maestro.Base.Services;
 using Maestro.Editors.Common;
-using System.IO;
-using Maestro.Base.Editor;
 
 namespace Maestro.Base.Commands.SiteExplorer
 {
@@ -75,4 +74,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/GetLayerSpatialContextCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/GetLayerSpatialContextCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/GetLayerSpatialContextCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,44 +1,54 @@
 #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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Editors.FeatureSource;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.ObjectModels.Common;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Maestro.Base.Commands.SiteExplorer
 {
     internal class GetLayerSpatialContextCommand : AbstractMenuCommand
     {
-        class SpatialContextNotFoundException : Exception
+        private class SpatialContextNotFoundException : Exception
         {
-            public SpatialContextNotFoundException() { }
-            public SpatialContextNotFoundException(string message) : base(message) { }
-            public SpatialContextNotFoundException(string message, Exception inner) : base(message, inner) { }
+            public SpatialContextNotFoundException()
+            {
+            }
+
+            public SpatialContextNotFoundException(string message)
+                : base(message)
+            {
+            }
+
+            public SpatialContextNotFoundException(string message, Exception inner)
+                : base(message, inner)
+            {
+            }
+
             protected SpatialContextNotFoundException(
               System.Runtime.Serialization.SerializationInfo info,
               System.Runtime.Serialization.StreamingContext context)
@@ -60,8 +70,9 @@
                         {
                             var connMgr = ServiceRegistry.GetService<ServerConnectionManager>();
                             var conn = connMgr.GetConnection(wb.ActiveSiteExplorer.ConnectionName);
-                            BusyWaitDialog.Run(Strings.RetrievingSpatialContextForLayer, 
-                            () => {
+                            BusyWaitDialog.Run(Strings.RetrievingSpatialContextForLayer,
+                            () =>
+                            {
                                 var resId = it.ResourceId;
                                 var ldf = (ILayerDefinition)conn.ResourceService.GetResource(resId);
 
@@ -97,7 +108,8 @@
                                 {
                                     throw new SpatialContextNotFoundException(string.Format(Strings.NonApplicableLayerType, ldf.SubLayer.LayerType));
                                 }
-                            }, (res, ex) => {
+                            }, (res, ex) =>
+                            {
                                 if (ex != null)
                                 {
                                     var nf = ex as SpatialContextNotFoundException;
@@ -121,7 +133,7 @@
             }
         }
 
-        static IFdoSpatialContext FindSpatialContext(FdoSpatialContextList spatialContexts, string scName)
+        private static IFdoSpatialContext FindSpatialContext(FdoSpatialContextList spatialContexts, string scName)
         {
             foreach (IFdoSpatialContext sc in spatialContexts.SpatialContext)
             {
@@ -131,4 +143,4 @@
             return null;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/MigrateResourceCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/MigrateResourceCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/MigrateResourceCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
+using Maestro.Editors.Migration;
 using Maestro.Login;
-using Maestro.Editors.Migration;
+using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI.CrossConnection;
 
 namespace Maestro.Base.Commands.SiteExplorer
@@ -81,4 +81,4 @@
             diag.RunOperationAsync(Workbench.Instance, method, source, target, resourceId, dependentResourceIds, overwrite);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/NewFolderCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/NewFolderCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/NewFolderCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Base.UI;
+using System.Collections.Generic;
 
 namespace Maestro.Base.Commands.SiteExplorer
 {
@@ -72,4 +73,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/OpenResourceCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/OpenResourceCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/OpenResourceCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
+using Maestro.Base.Services;
 using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Base.Services;
 
 namespace Maestro.Base.Commands.SiteExplorer
 {
@@ -58,4 +58,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/OpenWithXmlEditorCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/OpenWithXmlEditorCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/OpenWithXmlEditorCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
+using Maestro.Base.Editor;
+using Maestro.Base.Services;
 using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Base.Services;
-using Maestro.Base.Editor;
 
 namespace Maestro.Base.Commands.SiteExplorer
 {
@@ -66,4 +66,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/PurgeFeatureSourceCacheCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/PurgeFeatureSourceCacheCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/PurgeFeatureSourceCacheCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Base.Commands.SiteExplorer
 {
@@ -68,4 +68,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RefreshCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RefreshCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RefreshCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 
 namespace Maestro.Base.Commands.SiteExplorer
@@ -36,4 +36,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RenameCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RenameCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RenameCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Base.UI;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
+using System.Collections.Generic;
 
 namespace Maestro.Base.Commands.SiteExplorer
 {
@@ -116,7 +117,6 @@
 
                         return true;
                     });
-                    
 
                     //Need to refresh the model because it still is called by the old name
                     var folder = ResourceIdentifier.GetParentFolder(oldid);
@@ -125,4 +125,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RepointCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RepointCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RepointCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,40 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using Maestro.Base.UI;
-using System.Diagnostics;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
+using Maestro.Editors.Common;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.WebLayout;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
-using System.Xml;
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.IO;
+using System.Xml;
 
 namespace Maestro.Base.Commands.SiteExplorer
 {
@@ -117,4 +110,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ResourcePropertiesCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ResourcePropertiesCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ResourcePropertiesCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Base.UI;
@@ -61,4 +61,4 @@
                    conn.Capabilities.SupportsWmsPublishing;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/SaveResourceContentToDiskCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/SaveResourceContentToDiskCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/SaveResourceContentToDiskCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
-using Maestro.Base.UI;
 using Maestro.Base.Services;
 using Maestro.Shared.UI;
 
@@ -50,4 +49,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/SetupFolderStructureCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/SetupFolderStructureCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/SetupFolderStructureCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
+using Maestro.Base.Services;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using ICSharpCode.Core;
-using Maestro.Base.Services;
 
 namespace Maestro.Base.Commands.SiteExplorer
 {
@@ -64,4 +66,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ShowSpatialContextsCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ShowSpatialContextsCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ShowSpatialContextsCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Editors.FeatureSource;
@@ -52,4 +52,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/TestFeatureSourceCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/TestFeatureSourceCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/TestFeatureSourceCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using OSGeo.MapGuide.MaestroAPI;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Base.Commands.SiteExplorer
@@ -53,4 +53,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/TestResourceCompatibilityCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/TestResourceCompatibilityCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/TestResourceCompatibilityCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,37 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
+using Maestro.Base.UI;
 using Maestro.Shared.UI;
-using Maestro.Base.UI;
-using System.ComponentModel;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Capability;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels.Common;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
 
 #pragma warning disable 1591
 
@@ -143,12 +145,11 @@
         }
     }
 
-    class TestCapabilities : ConnectionCapabilities
+    internal class TestCapabilities : ConnectionCapabilities
     {
         public TestCapabilities(MockServerConnection conn)
             : base(conn)
         {
-
         }
 
         public override int[] SupportedCommands
@@ -167,7 +168,7 @@
         }
     }
 
-    class MockServerConnection : IServerConnection
+    internal class MockServerConnection : IServerConnection
     {
         public string ProviderName
         {
@@ -313,4 +314,4 @@
             throw new NotImplementedException();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ValidateCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ValidateCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ValidateCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using ICSharpCode.Core;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Base.Services;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
-using System.ComponentModel;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
-using Maestro.Base.UI;
 
 namespace Maestro.Base.Commands.SiteExplorer
 {
@@ -59,4 +52,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/StartupCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/StartupCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/StartupCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,37 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
-using System.Reflection;
 using Maestro.Base.Services;
-using Maestro.Base.Events;
 using Maestro.Base.UI;
-using Maestro.Base.Editor;
-using OSGeo.MapGuide.ObjectModels.WebLayout;
-using Props = ICSharpCode.Core.PropertyService;
 using Maestro.Base.UI.Preferences;
-using System.Windows.Forms;
-using Maestro.Shared.UI;
 using Maestro.Editors.Preview;
+using Maestro.Shared.UI;
+using Props = ICSharpCode.Core.PropertyService;
 
 namespace Maestro.Base.Commands
 {
@@ -41,7 +36,7 @@
         {
             ResourceService.RegisterNeutralImages(Properties.Resources.ResourceManager);
             ResourceService.RegisterNeutralStrings(Strings.ResourceManager);
-            
+
             Workbench.WorkbenchInitialized += (sender, e) =>
             {
                 PreviewSettings.UseAjaxViewer = PropertyService.Get(ConfigProperties.PreviewViewerType, "AJAX") == "AJAX"; //NOXLATE
@@ -60,7 +55,7 @@
                 wb.Text = "MapGuide Maestro"; //NOXLATE
 
                 var mgr = ServiceRegistry.GetService<ViewContentManager>();
-                
+
                 if (Props.Get(ConfigProperties.ShowMessages, true))
                     mgr.OpenContent<MessageViewer>(ViewRegion.Bottom);
 
@@ -71,9 +66,9 @@
             };
         }
 
-        void OnWorkbenchClosing(object sender, System.Windows.Forms.FormClosingEventArgs e)
+        private void OnWorkbenchClosing(object sender, System.Windows.Forms.FormClosingEventArgs e)
         {
-            e.Cancel = Maestro.Base.Commands.SiteExplorer.DisconnectCommand.CancelDisconnect();   
+            e.Cancel = Maestro.Base.Commands.SiteExplorer.DisconnectCommand.CancelDisconnect();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenCoordinateSystemPickerCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenCoordinateSystemPickerCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenCoordinateSystemPickerCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
+using Maestro.Base.Services;
 using Maestro.Editors.Common;
-using Maestro.Base.Services;
 
 namespace Maestro.Base.Commands.Test
 {
@@ -46,4 +46,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenResourceCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenResourceCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenResourceCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Editors.Generic;
@@ -90,7 +90,6 @@
         }
     }
 
-
     internal class OpenResourceWithFilterCommand : AbstractMenuCommand
     {
         public override void Run()
@@ -111,4 +110,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenSymbolBrowserCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenSymbolBrowserCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenSymbolBrowserCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
+using Maestro.Editors.Common;
 using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Common;
 
 namespace Maestro.Base.Commands.Test
 {
@@ -50,4 +50,4 @@
             MessageService.ShowMessage(Strings.Cancelled);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenUnmanagedResourceCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenUnmanagedResourceCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenUnmanagedResourceCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
+using Maestro.Base.Services;
 using Maestro.Editors.Common;
-using Maestro.Base.Services;
+using System;
 
 namespace Maestro.Base.Commands.Test
 {
@@ -68,4 +69,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Test/SelectFdoProviderCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Test/SelectFdoProviderCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Test/SelectFdoProviderCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Editors.Common;
@@ -47,4 +47,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Test/TestCommands.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Test/TestCommands.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Test/TestCommands.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
+using Maestro.Base.Services;
 using Maestro.Editors.Generic;
-using Maestro.Base.Services;
 using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Base.Commands.Test
@@ -68,4 +68,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Test/TriggerDbXmlCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Test/TriggerDbXmlCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Test/TriggerDbXmlCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Editors.Common;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 
 namespace Maestro.Base.Commands.Test
@@ -37,8 +38,8 @@
             var mgr = ServiceRegistry.GetService<ServerConnectionManager>();
             var conn = mgr.GetConnection(exp.ConnectionName);
 
-            string xml = 
-                "<FeatureSource xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xsi:noNamespaceSchemaLocation=\"FeatureSource-1.0.0.xsd\">\n" + 
+            string xml =
+                "<FeatureSource xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xsi:noNamespaceSchemaLocation=\"FeatureSource-1.0.0.xsd\">\n" +
                 "<Foo />\n" +
                 "</FeatureSource>";
             try
@@ -55,4 +56,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/TipOfTheDayCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/TipOfTheDayCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/TipOfTheDayCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.UI;
 
@@ -32,4 +32,4 @@
             TipOfTheDayDialog.Open();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/TranslateLayoutCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/TranslateLayoutCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/TranslateLayoutCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
+using Maestro.Base.Editor;
+using Maestro.Base.UI;
 using System.Collections.Generic;
+using System.IO;
 using System.Text;
-using ICSharpCode.Core;
 using System.Xml;
-using Maestro.Base.UI;
-using System.IO;
-using Maestro.Base.Editor;
 
 namespace Maestro.Base.Commands
 {
@@ -41,7 +43,6 @@
                 if (rt == OSGeo.MapGuide.MaestroAPI.ResourceTypes.ApplicationDefinition.ToString() ||
                     rt == OSGeo.MapGuide.MaestroAPI.ResourceTypes.WebLayout.ToString())
                 {
-
                     var doc = new XmlDocument();
                     doc.LoadXml(ed.GetXmlContent());
 
@@ -67,4 +68,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/UserGuideCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/UserGuideCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/UserGuideCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
+using System.Diagnostics;
 using System.IO;
-using System.Diagnostics;
 
 namespace Maestro.Base.Commands
 {
@@ -35,10 +35,10 @@
             {
                 MessageService.ShowError(Strings.HelpFileNotFound);
             }
-            else 
+            else
             {
                 Process.Start(path);
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/ValidateEditedResourceCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/ValidateEditedResourceCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/ValidateEditedResourceCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,37 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
+using Maestro.Base.Editor;
+using Maestro.Base.Services;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
 using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
 using OSGeo.MapGuide.ObjectModels.Common;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
-using Maestro.Shared.UI;
-using Maestro.Base.Services;
-using Maestro.Base.Editor;
 
 namespace Maestro.Base.Commands
 {
@@ -159,7 +161,7 @@
                 {
                     ed.EditorService.SyncSessionCopy();
                 }
-                
+
                 var pdlg = new ProgressDialog();
                 pdlg.CancelAbortsThread = true;
 
@@ -169,4 +171,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/ViewXmlChangesCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/ViewXmlChangesCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/ViewXmlChangesCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Editors.Diff;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI.Resource.Comparison;
-using System.Xml;
+using System;
+using System.IO;
+using System.Windows.Forms;
 
 namespace Maestro.Base.Commands
 {
@@ -90,4 +89,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/XmlEditCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/XmlEditCommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/XmlEditCommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace Maestro.Base.Commands
 {
     internal class XmlEditCommand : NotImplementedCommand
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/DrawingSourceEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/DrawingSourceEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/DrawingSourceEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using ICSharpCode.Core;
-using OSGeo.MapGuide.MaestroAPI.Resource;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors;
 using Maestro.Editors.DrawingSource;
+using System.Drawing;
+using System.Windows.Forms;
 
 #pragma warning disable 1591
 
@@ -76,4 +72,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/EditorContentBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/EditorContentBase.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/EditorContentBase.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,41 +1,40 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
-using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
-using Maestro.Base.UI;
+using Maestro.Base.Services;
 using Maestro.Base.UI.Preferences;
+using Maestro.Editors;
+using Maestro.Editors.Preview;
 using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Resource.Conversion;
+using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.IO;
-using Maestro.Base.Services;
-using Maestro.Editors.Preview;
+using System.Windows.Forms;
 
 #pragma warning disable 1591
 
@@ -124,7 +123,7 @@
             }
         }
 
-        void OnSessionIdChanged(object sender, EventArgs e)
+        private void OnSessionIdChanged(object sender, EventArgs e)
         {
             this.RequiresReload = true;
         }
@@ -144,14 +143,14 @@
         /// <summary>
         /// Gets the edited resource
         /// </summary>
-        public IResource Resource 
-        { 
-            get 
+        public IResource Resource
+        {
+            get
             {
                 if (this.EditorService == null)
                     return null;
-                return this.EditorService.GetEditedResource(); 
-            } 
+                return this.EditorService.GetEditedResource();
+            }
         }
 
         private void OpenAffectedResource(IResource res)
@@ -161,15 +160,15 @@
 
         /// <summary>
         /// Performs any pre-save validation logic. The base implementation performs
-        /// a <see cref="ResourceValidatorSet"/> validation (non-casccading) on the 
-        /// edited resource before attempting a save into the session repository 
+        /// a <see cref="ResourceValidatorSet"/> validation (non-casccading) on the
+        /// edited resource before attempting a save into the session repository
         /// (triggering any errors relating to invalid XML content). Override this
-        /// method if the base implementation just described does not cover your 
+        /// method if the base implementation just described does not cover your
         /// validation needs.
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected virtual void OnBeforeSave(object sender, CancelEventArgs e) 
+        protected virtual void OnBeforeSave(object sender, CancelEventArgs e)
         {
             //We've been editing an in-memory model of the session copy
             //so we need to save this model back to the session copy before Save()
@@ -180,13 +179,14 @@
                 var validate = PropertyService.Get(ConfigProperties.ValidateOnSave, true);
                 if (this.IsDirty && validate)
                 {
-                    BusyWaitDelegate del = () => 
+                    BusyWaitDelegate del = () =>
                     {
                         var errors = new List<ValidationIssue>(ValidateEditedResource()).ToArray();
                         return errors;
                     };
-                    
-                    BusyWaitDialog.Run(Strings.PrgPreSaveValidation, del, (result, ex) => {
+
+                    BusyWaitDialog.Run(Strings.PrgPreSaveValidation, del, (result, ex) =>
+                    {
                         if (ex != null)
                             throw ex;
 
@@ -201,7 +201,7 @@
                         else
                         {
                             e.Cancel = false;
-                        }               
+                        }
                     });
                 }
                 else
@@ -233,7 +233,7 @@
         /// this returns the results of a non-cascading <see cref="ResourceValidatorSet"/>
         /// validation run. Override this if you have a custom method of validation.
         /// </summary>
-        protected virtual ICollection<ValidationIssue> ValidateEditedResource() 
+        protected virtual ICollection<ValidationIssue> ValidateEditedResource()
         {
             var conn = _svc.CurrentConnection;
             var context = new ResourceValidationContext(conn.ResourceService, conn.FeatureService);
@@ -245,7 +245,7 @@
             return errors;
         }
 
-        void OnSaved(object sender, EventArgs e)
+        private void OnSaved(object sender, EventArgs e)
         {
             UpdateTitle();
         }
@@ -261,9 +261,9 @@
             this.Description = GetTooltip(this.IsNew ? Strings.NewResource : _svc.ResourceID);
         }
 
-        const string DIRTY_PREFIX = "* "; //NOXLATE
+        private const string DIRTY_PREFIX = "* "; //NOXLATE
 
-        void OnDirtyStateChanged(object sender, EventArgs e)
+        private void OnDirtyStateChanged(object sender, EventArgs e)
         {
             this.IsDirty = _svc.IsDirty; //Sync states
             if (_svc.IsDirty)
@@ -281,14 +281,14 @@
         /// <summary>
         /// Binds the specified resource to this control. This effectively initializes
         /// all the fields in this control and sets up databinding on all fields. All
-        /// subclasses *must* override this method. 
-        /// 
+        /// subclasses *must* override this method.
+        ///
         /// Also note that this method may be called more than once (e.g. Returning from
         /// and XML edit of this resource). Thus subclasses must take this scenario into
         /// account when implementing
         /// </summary>
         /// <param name="service"></param>
-        protected virtual void Bind(IEditorService service) 
+        protected virtual void Bind(IEditorService service)
         {
             throw new NotImplementedException();
         }
@@ -413,16 +413,16 @@
             {
                 var conv = new ResourceObjectConverter();
                 var res2 = conv.Convert(res, ver);
-                
+
                 using (var stream = ResourceTypeRegistry.Serialize(res2))
                 {
-                    using (var sr =new StreamReader(stream))
+                    using (var sr = new StreamReader(stream))
                     {
                         _svc.UpdateResourceContent(sr.ReadToEnd());
                         ((ResourceEditorService)_svc).ReReadSessionResource();
                     }
                 }
-                
+
                 //This will re-init everything
                 this.EditorService = this.EditorService;
                 MessageBox.Show(string.Format(Strings.ResourceUpgraded, ver.Major, ver.Minor, ver.Build));
@@ -449,4 +449,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/FeatureSourceEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/FeatureSourceEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/FeatureSourceEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,35 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
+using Maestro.Editors;
+using Maestro.Editors.FeatureSource;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using Maestro.Editors;
-using ICSharpCode.Core;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using Maestro.Editors.FeatureSource;
 
 #pragma warning disable 1591
 
@@ -136,4 +137,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/FsEditorOptionPanel.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/FsEditorOptionPanel.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/FsEditorOptionPanel.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,42 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using Maestro.Shared.UI;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.ObjectModels.Capabilities;
-using OSGeo.MapGuide.MaestroAPI.Services;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors;
-using Maestro.Base.UI.Preferences;
-using ICSharpCode.Core;
-using System.IO;
-using System.Diagnostics;
-using OSGeo.MapGuide.MaestroAPI;
+using Maestro.Editors.Common;
 using Maestro.Editors.FeatureSource;
 using Maestro.Editors.Generic;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels.Capabilities;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using System;
+using System.Windows.Forms;
 
 namespace Maestro.Base.Editor
 {
@@ -136,4 +128,4 @@
             new SpatialContextsDialog(_fs).ShowDialog();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/FusionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/FusionEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/FusionEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using Maestro.Editors.Fusion;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using System.Drawing;
+using System.Windows.Forms;
 
 #pragma warning disable 1591
 
@@ -38,7 +36,7 @@
     /// <remarks>
     /// Although public, this class is undocumented and reserved for internal use by built-in Maestro AddIns
     /// </remarks>
-    public partial class FusionEditor: EditorContentBase
+    public partial class FusionEditor : EditorContentBase
     {
         public FusionEditor()
         {
@@ -75,4 +73,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/IEditorFactory.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/IEditorFactory.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/IEditorFactory.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,35 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Resource;
 
 namespace Maestro.Base.Editor
 {
     /// <summary>
     /// Defines an interface for creating editor views for a given resource.
-    /// 
+    ///
     /// Implementations of this interface that are registered under the /Maestro/Editors path in
     /// any addin manifest will be automatically loaded by Maestro and be registered to handle
-    /// the opening of any resource whose type and version matches the 
+    /// the opening of any resource whose type and version matches the
     /// <see cref="P:Maestro.Base.Editor.IEditorFactory.ResourceTypeAndVersion"/> property
     /// </summary>
     public interface IEditorFactory
@@ -65,7 +65,7 @@
     {
         public ResourceTypeDescriptor ResourceTypeAndVersion { get; private set; }
 
-        public DrawingSourceEditorFactory() 
+        public DrawingSourceEditorFactory()
         {
             this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.DrawingSource.ToString(), "1.0.0"); //NOXLATE
         }
@@ -80,7 +80,7 @@
     {
         public ResourceTypeDescriptor ResourceTypeAndVersion { get; private set; }
 
-        public FeatureSourceEditorFactory() 
+        public FeatureSourceEditorFactory()
         {
             this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.FeatureSource.ToString(), "1.0.0"); //NOXLATE
         }
@@ -95,7 +95,7 @@
     {
         public ResourceTypeDescriptor ResourceTypeAndVersion { get; private set; }
 
-        public LayerDefinitionEditorFactory() 
+        public LayerDefinitionEditorFactory()
         {
             this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LayerDefinition.ToString(), "1.0.0"); //NOXLATE
         }
@@ -110,7 +110,7 @@
     {
         public ResourceTypeDescriptor ResourceTypeAndVersion { get; private set; }
 
-        public LoadProcedureEditorFactory() 
+        public LoadProcedureEditorFactory()
         {
             this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LoadProcedure.ToString(), "1.0.0"); //NOXLATE
         }
@@ -125,7 +125,7 @@
     {
         public ResourceTypeDescriptor ResourceTypeAndVersion { get; private set; }
 
-        public MapDefinitionEditorFactory() 
+        public MapDefinitionEditorFactory()
         {
             this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.MapDefinition.ToString(), "1.0.0"); //NOXLATE
         }
@@ -140,7 +140,7 @@
     {
         public ResourceTypeDescriptor ResourceTypeAndVersion { get; private set; }
 
-        public PrintLayoutEditorFactory() 
+        public PrintLayoutEditorFactory()
         {
             this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.PrintLayout.ToString(), "1.0.0"); //NOXLATE
         }
@@ -154,8 +154,8 @@
     internal class SymbolDefinitionEditorFactory : IEditorFactory
     {
         public ResourceTypeDescriptor ResourceTypeAndVersion { get; private set; }
-        
-        public SymbolDefinitionEditorFactory() 
+
+        public SymbolDefinitionEditorFactory()
         {
             this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.SymbolDefinition.ToString(), "1.0.0"); //NOXLATE
         }
@@ -170,7 +170,7 @@
     {
         public ResourceTypeDescriptor ResourceTypeAndVersion { get; private set; }
 
-        public WebLayoutEditorFactory() 
+        public WebLayoutEditorFactory()
         {
             this.ResourceTypeAndVersion = new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.WebLayout.ToString(), "1.0.0"); //NOXLATE
         }
@@ -180,4 +180,4 @@
             return new WebLayoutEditor();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/IEditorViewContent.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/IEditorViewContent.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/IEditorViewContent.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors;
 using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using System;
 
 namespace Maestro.Base.Editor
 {
@@ -111,4 +111,4 @@
         /// </summary>
         void SyncSessionCopy();
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/LayerDefinitionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/LayerDefinitionEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/LayerDefinitionEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,38 +1,37 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
+using Maestro.Editors;
+using Maestro.Editors.LayerDefinition;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using System.Diagnostics;
-using Maestro.Editors.LayerDefinition;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using Maestro.Editors;
-using ICSharpCode.Core;
-using OSGeo.MapGuide.ObjectModels;
-using Maestro.Base.UI.Preferences;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
 
 #pragma warning disable 1591
 
@@ -152,7 +151,6 @@
 
         private void panelBody_Resize(object sender, EventArgs e)
         {
-            
         }
 
         public override Icon ViewIcon
@@ -163,4 +161,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/LoadProcedureEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/LoadProcedureEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/LoadProcedureEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.LoadProcedure;
 using OSGeo.MapGuide.ObjectModels.LoadProcedure;
+using System.Drawing;
+using System.Windows.Forms;
 
 #pragma warning disable 1591
 
@@ -74,4 +72,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/MapDefinitionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/MapDefinitionEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/MapDefinitionEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
+using Maestro.Editors;
+using Maestro.Editors.MapDefinition;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using System.ComponentModel;
 using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using Maestro.Editors;
-using ICSharpCode.Core;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using Maestro.Editors.MapDefinition;
 
 #pragma warning disable 1591
 
@@ -102,7 +101,7 @@
                     }
                 }
             }
-                            
+
             base.OnBeforeSave(sender, e);
         }
 
@@ -122,4 +121,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/PrintLayoutEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/PrintLayoutEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/PrintLayoutEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.PrintLayout;
 using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using Maestro.Editors.PrintLayout;
 
 #pragma warning disable 1591
 
@@ -51,7 +49,7 @@
             printLayoutEditorCtrl.Dock = DockStyle.Fill;
             panelBody.Controls.Add(printLayoutEditorCtrl);
 
-            printLayoutEditorCtrl.Bind(service);   
+            printLayoutEditorCtrl.Bind(service);
         }
 
         public override Icon ViewIcon
@@ -62,4 +60,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/ResourceEditorService.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/ResourceEditorService.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/ResourceEditorService.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,38 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Maestro.Editors;
-using OSGeo.MapGuide.MaestroAPI.Resource;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Base.Services;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Generic;
-using System.ComponentModel;
-using System.IO;
-using Maestro.Editors.Common;
 using Maestro.Base.UI;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
+using Maestro.Editors;
 using Maestro.Editors.Preview;
+using OSGeo.MapGuide.MaestroAPI;
+using System;
+using System.ComponentModel;
 
 namespace Maestro.Base.Editor
 {
@@ -94,4 +88,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/SymbolDefinitionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/SymbolDefinitionEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/SymbolDefinitionEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.SymbolDefinition;
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
+using System.Drawing;
+using System.Windows.Forms;
 
 #pragma warning disable 1591
 
@@ -73,4 +71,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/UnsupportedEditorControl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/UnsupportedEditorControl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/UnsupportedEditorControl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Windows.Forms;
 
 namespace Maestro.Base.Editor
@@ -37,4 +34,4 @@
             InitializeComponent();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/WatermarkDefinitionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/WatermarkDefinitionEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/WatermarkDefinitionEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Resource;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors;
 using Maestro.Editors.WatermarkDefinition;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using System.Drawing;
+using System.Windows.Forms;
 
 #pragma warning disable 1591
 
@@ -75,4 +73,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/WebLayoutEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/WebLayoutEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/WebLayoutEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.WebLayout;
 using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using Maestro.Editors.WebLayout;
 
 #pragma warning disable 1591
 
@@ -62,4 +60,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/XmlEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/XmlEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/XmlEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,43 +1,39 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using Maestro.Editors.Generic;
-using System.IO;
-using OSGeo.MapGuide.MaestroAPI.Resource;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
-using OSGeo.MapGuide.MaestroAPI;
-using System.Xml;
-using Maestro.Editors;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
-using System.Xml.Schema;
 using Maestro.Base.UI.Preferences;
-using Maestro.Base.Services;
+using Maestro.Editors;
 using Maestro.Editors.Common;
+using Maestro.Editors.Generic;
 using Maestro.Editors.Preview;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Text;
 
 #pragma warning disable 1591
 
@@ -177,7 +173,7 @@
             if (previewer != null)
                 previewer.Preview(previewCopy, this.EditorService);
         }
-        
+
         public override void SyncSessionCopy()
         {
             //Write our XML changes back into the edited resource copy and re-read
@@ -226,4 +222,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Events/EventWatcher.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Events/EventWatcher.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Events/EventWatcher.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,37 +1,36 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
 using Maestro.Base.Services;
-using System.Diagnostics;
 using Maestro.Base.UI;
-using Maestro.Editors.Diagnostics;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using ICSharpCode.Core;
-using System.Windows.Forms;
-using Maestro.Shared.UI;
 using Maestro.Base.UI.Preferences;
+using Maestro.Editors.Generic;
+using Maestro.Editors.LayerDefinition;
 using Maestro.Editors.Preview;
-using Maestro.Editors.LayerDefinition;
-using Maestro.Editors.Generic;
+using Maestro.Shared.UI;
+using System;
+using System.Diagnostics;
+using System.Windows.Forms;
 
 namespace Maestro.Base.Events
 {
@@ -70,18 +69,22 @@
                     PreviewSettings.UseLocalPreview = Convert.ToBoolean(e.NewValue);
                     LoggingService.Info("Use Local Preview setting is now: " + PreviewSettings.UseLocalPreview); //NOXLATE
                     break;
+
                 case ConfigProperties.AddDebugWatermark:
                     PreviewSettings.AddDebugWatermark = Convert.ToBoolean(e.NewValue);
                     LoggingService.Info("Add Debug Watermark setting is now: " + PreviewSettings.AddDebugWatermark); //NOXLATE
                     break;
+
                 case ConfigProperties.PreviewViewerType:
                     PreviewSettings.UseAjaxViewer = (e.NewValue.ToString() == "AJAX"); //NOXLATE
                     LoggingService.Info("Use AJAX Viewer setting is now: " + PreviewSettings.UseAjaxViewer);
                     break;
+
                 case ConfigProperties.UseGridStyleEditor:
                     LayerEditorSettings.UseGridEditor = Convert.ToBoolean(e.NewValue);
                     LoggingService.Info("Use Grid Style Editor is now: " + LayerEditorSettings.UseGridEditor);
                     break;
+
                 case ConfigProperties.XsdSchemaPath:
                     XmlEditorSettings.XsdPath = e.NewValue.ToString();
                     LoggingService.Info("XSD path is now: " + XmlEditorSettings.XsdPath);
@@ -89,9 +92,9 @@
             }
         }
 
-        static bool smShowingError = false;
+        private static bool smShowingError = false;
 
-        static void OnKeepAliveTimerElapsed(object sender, EventArgs e)
+        private static void OnKeepAliveTimerElapsed(object sender, EventArgs e)
         {
             var svc = ServiceRegistry.GetService<ServerConnectionManager>();
             foreach (var name in svc.GetConnectionNames())
@@ -127,7 +130,7 @@
             }
         }
 
-        static void OnConnectionRemoved(object sender, ServerConnectionEventArgs e)
+        private static void OnConnectionRemoved(object sender, ServerConnectionEventArgs e)
         {
             Workbench wb = Workbench.Instance;
             Debug.Assert(wb.ActiveSiteExplorer != null);
@@ -136,16 +139,16 @@
             //Debug.Assert(wb.ActiveSiteExplorer.ConnectionName == name);
         }
 
-        static void OnConnectionAdded(object sender, ServerConnectionEventArgs e)
+        private static void OnConnectionAdded(object sender, ServerConnectionEventArgs e)
         {
             var wb = Workbench.Instance;
             if (wb.ActiveSiteExplorer == null)
             {
                 var viewMgr = ServiceRegistry.GetService<ViewContentManager>();
 
-                wb.ActiveSiteExplorer = viewMgr.OpenContent(Strings.Content_SiteExplorer, 
-                                        Strings.Content_SiteExplorer, 
-                                        ViewRegion.Left, 
+                wb.ActiveSiteExplorer = viewMgr.OpenContent(Strings.Content_SiteExplorer,
+                                        Strings.Content_SiteExplorer,
+                                        ViewRegion.Left,
                                         () => { return new SiteExplorer(); });
 
                 wb.ActiveSiteExplorer.ActiveConnectionChanged += new EventHandler(OnActiveConnectionChanged);
@@ -159,7 +162,6 @@
             }
 
             wb.ActiveSiteExplorer.RefreshModel(e.ConnectionName);
-            
 
             var svc = ServiceRegistry.GetService<ServerConnectionManager>();
             var conn = svc.GetConnection(e.ConnectionName);
@@ -167,7 +169,7 @@
             LoggingService.Info("There are now " + svc.GetConnectionNames().Count + " active connections"); //NOXLATE
         }
 
-        static void OnActiveConnectionChanged(object sender, EventArgs e)
+        private static void OnActiveConnectionChanged(object sender, EventArgs e)
         {
             var wb = Workbench.Instance;
             var exp = wb.ActiveSiteExplorer;
@@ -181,4 +183,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Maestro.Base.addin
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Maestro.Base.addin	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Maestro.Base.addin	2014-12-25 08:20:40 UTC (rev 8459)
@@ -42,7 +42,7 @@
         <Class id="SltHandler" class="Maestro.Base.Services.DragDropHandlers.SltFileHandler" />
         <Class id="XmlResHandler" class="Maestro.Base.Services.DragDropHandlers.XmlResFileHandler" />
     </Path>
-    
+
     <!-- Registered editors -->
     <Path name="/Maestro/Editors">
         <Class id="FusionEditor100" class="Maestro.Base.Editor.FusionEditorFactory" />
@@ -73,7 +73,7 @@
         <Class id="CompoundSymbol100" class="Maestro.Base.Templates.CompoundSymbolDefinitionItemTemplate" />
         <Class id="WebLayout100" class="Maestro.Base.Templates.WebLayoutItemTemplate" />
     </Path>
-    
+
     <!-- Main Menu Definition -->
     <Path name="/Maestro/Shell/MainMenu">
         <MenuItem id="Menu_File"
@@ -200,7 +200,7 @@
             <MenuItem id="Menu_Tools_Options"
                       label="${res:Menu_Tools_Options}"
                       icon="application_task"
-                      class="Maestro.Base.Commands.OptionsCommand"/>
+                      class="Maestro.Base.Commands.OptionsCommand" />
         </MenuItem>
         <MenuItem id="Menu_Window"
                   type="Menu"
@@ -236,7 +236,7 @@
             <MenuItem id="EditPackage"
                       label="${res:EditPackage}"
                       icon="box__pencil"
-                      class="Maestro.Base.Commands.EditPackageCommand"/>
+                      class="Maestro.Base.Commands.EditPackageCommand" />
         </MenuItem>
         <MenuItem id="Menu_Help"
                   type="Menu"
@@ -275,7 +275,7 @@
         <Class id="MessageViewer" class="Maestro.Base.UI.MessageViewer" />
         <Class id="OutboundRequestViewer" class="Maestro.Base.UI.OutboundRequestViewer" />
     </Path>
-    
+
     <!-- Toolbar Definition -->
     <Path name="/Maestro/Shell/Toolbars/Main">
         <ToolbarItem id="Connect"
@@ -374,10 +374,10 @@
                          tooltip="${res:Menu_Tools_XmlChanges_Desc}"
                          class="Maestro.Base.Commands.ViewXmlChangesCommand" />
         </Condition>
-        <!-- 
+        <!--
         Only needed if our custom drawn close buttons don't appear on document
-        tabs (I'm looking at you Mono). So far this isn't the case. 
-        
+        tabs (I'm looking at you Mono). So far this isn't the case.
+
         This command is a fallback in case there are problems.
         -->
         <!--
@@ -390,7 +390,7 @@
         </Condition>
         -->
     </Path>
-    
+
     <!-- Site Explorer Toolbar -->
     <Path name="/Maestro/Shell/SiteExplorer/Toolbar">
         <Condition action="Disable" name="NotConnected">
@@ -413,7 +413,7 @@
                          class="Maestro.Base.Commands.SiteExplorer.RefreshCommand" />
         </Condition>
     </Path>
-    
+
     <!-- Site Explorer Context Menu -->
     <Path name="/Maestro/Shell/SiteExplorer/SelectedFolder">
         <Condition action="Disable" name="SelectedItem" type="Folder">
@@ -712,26 +712,25 @@
     <Path id="/Workspace/Tools">
         <MenuItem id="SiteAdmin"
                       label="${res:SiteAdministrator}"
-                      class="Maestro.Base.Commands.SiteAdministratorCommand"/>
+                      class="Maestro.Base.Commands.SiteAdministratorCommand" />
         <MenuItem id="MgCooker"
                   label="${res:MgCooker}"
-                  class="Maestro.Base.Commands.MgCookerCommand"/>
+                  class="Maestro.Base.Commands.MgCookerCommand" />
         <MenuItem id="LocalFsPreview"
                   label="${res:LocalFsPreview}"
-                  class="Maestro.Base.Commands.LocalFeatureSourcePreviewCommand"/>
+                  class="Maestro.Base.Commands.LocalFeatureSourcePreviewCommand" />
         <MenuItem id="RtMapInspector"
                   label="${res:RtMapInspector}"
-                  class="Maestro.Base.Commands.RtMapInspectorCommand"/>
+                  class="Maestro.Base.Commands.RtMapInspectorCommand" />
         <MenuItem id="ServerMonitor"
                   label="${res:ServerMonitor}"
                   icon="system_monitor"
-                  class="Maestro.Base.Commands.ServerMonitorCommand"/>
+                  class="Maestro.Base.Commands.ServerMonitorCommand" />
         <MenuItem id="CacheView"
                   label="${res:CacheView}"
-                  class="Maestro.Base.Commands.CacheViewerCommand"/>
+                  class="Maestro.Base.Commands.CacheViewerCommand" />
         <MenuItem id="LiveMapEditor"
                   label="${res:LiveMapEditor}"
-                  class="Maestro.Base.Commands.LiveMapEditorCommand"/>
+                  class="Maestro.Base.Commands.LiveMapEditorCommand" />
     </Path>
-    
-</AddIn>
+</AddIn>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/MaestroPaths.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/MaestroPaths.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/MaestroPaths.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.IO;
 using System.Reflection;
-using System.IO;
 
 namespace Maestro.Base
 {
@@ -69,4 +69,4 @@
             }
         }*/
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Maestro.Base")]
@@ -11,8 +10,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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)]
 

Modified: trunk/Tools/Maestro/Maestro.Base/Services/ClipboardService.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/ClipboardService.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Services/ClipboardService.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows.Forms;
-using ICSharpCode.Core;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Base.UI;
-using OSGeo.MapGuide.MaestroAPI;
 using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Base.Services
 {
     /// <summary>
-    /// Clipboard service. This simulates the behaviour of a clipboard, it does 
+    /// Clipboard service. This simulates the behaviour of a clipboard, it does
     /// not actually put and retrieve data from the system clipboard.
     /// </summary>
     public class ClipboardService : ServiceBase
@@ -121,4 +119,4 @@
             return state;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlerService.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlerService.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlerService.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
+using Maestro.Shared.UI;
 using System.Collections.Generic;
-using System.Text;
 using System.IO;
-using ICSharpCode.Core;
-using Maestro.Shared.UI;
 
 namespace Maestro.Base.Services
 {
@@ -72,4 +73,4 @@
             return matches;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/DwfFileHandler.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/DwfFileHandler.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/DwfFileHandler.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
-using System.IO;
-using ICSharpCode.Core;
 using OSGeo.MapGuide.ObjectModels;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels.DrawingSource;
+using System;
+using System.IO;
 
 namespace Maestro.Base.Services.DragDropHandlers
 {
@@ -37,7 +37,7 @@
             get { return Strings.DwfHandlerAction; }
         }
 
-        string[] extensions = { ".dwf" }; //NOXLATE
+        private string[] extensions = { ".dwf" }; //NOXLATE
 
         public bool HandleDrop(IServerConnection conn, string file, string folderId)
         {
@@ -90,4 +90,4 @@
             return HandlerUtil.ExtensionInList(extensions, fileExtension);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/PackageFileHandler.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/PackageFileHandler.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/PackageFileHandler.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Packaging;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
+using System;
 using System.Windows.Forms;
 
 namespace Maestro.Base.Services.DragDropHandlers
@@ -36,7 +36,7 @@
             get { return Strings.MgpHandlerAction; }
         }
 
-        string[] extensions = { ".mgp" }; //NOXLATE
+        private string[] extensions = { ".mgp" }; //NOXLATE
 
         public bool HandleDrop(IServerConnection conn, string file, string folderId)
         {
@@ -81,4 +81,4 @@
             return HandlerUtil.ExtensionInList(extensions, fileExtension);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SdfFileHandler.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SdfFileHandler.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SdfFileHandler.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.IO;
-using ICSharpCode.Core;
-using OSGeo.MapGuide.ObjectModels;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Base.Services.DragDropHandlers
 {
@@ -36,7 +36,7 @@
             get { return Strings.SdfHandlerAction; }
         }
 
-        string[] extensions = { ".sdf" }; //NOXLATE
+        private string[] extensions = { ".sdf" }; //NOXLATE
 
         public bool HandleDrop(IServerConnection conn, string file, string folderId)
         {
@@ -83,4 +83,4 @@
             return HandlerUtil.ExtensionInList(extensions, fileExtension);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/ShpFileHandler.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/ShpFileHandler.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/ShpFileHandler.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.ObjectModels;
 using System.IO;
-using ICSharpCode.Core;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Base.Services.DragDropHandlers
 {
@@ -60,7 +60,7 @@
                 conn.ResourceService.SaveResource(fs);
 
                 //As we all know, the term shape file is deceptive...
-                string[] files = new string[] 
+                string[] files = new string[]
                 {
                     file,
                     file.Substring(0, file.LastIndexOf(".")) + ".shx", //NOXLATE
@@ -101,4 +101,4 @@
             return HandlerUtil.ExtensionInList(extensions, fileExtension);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SltFileHandler.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SltFileHandler.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SltFileHandler.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.IO;
-using ICSharpCode.Core;
-using OSGeo.MapGuide.ObjectModels;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Base.Services.DragDropHandlers
 {
@@ -36,7 +36,7 @@
             get { return Strings.SdfHandlerAction; }
         }
 
-        string[] extensions = { ".sqlite", ".db", ".slt" }; //NOXLATE
+        private string[] extensions = { ".sqlite", ".db", ".slt" }; //NOXLATE
 
         public bool HandleDrop(IServerConnection conn, string file, string folderId)
         {
@@ -83,4 +83,4 @@
             return HandlerUtil.ExtensionInList(extensions, fileExtension);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/XmlResFileHandler.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/XmlResFileHandler.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/XmlResFileHandler.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.IO;
-using ICSharpCode.Core;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Shared.UI;
+using System.Text;
 
 namespace Maestro.Base.Services.DragDropHandlers
 {
@@ -46,7 +45,7 @@
                 string xml = File.ReadAllText(file);
                 int counter = 0;
                 string name = Path.GetFileNameWithoutExtension(file);
-                
+
                 try
                 {
                     //The easiest way to tell if this XML file is legit
@@ -74,7 +73,7 @@
                         conn.ResourceService.SetResourceXmlData(resId, ms);
                     }
                 }
-                return true;   
+                return true;
             }
             catch (Exception ex)
             {
@@ -93,4 +92,4 @@
             return true;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Services/IDragDropHandler.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/IDragDropHandler.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Services/IDragDropHandler.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Base.Services
 {
@@ -58,4 +59,4 @@
             return Array.FindIndex(extensions, t => t.IndexOf(fileExtension, StringComparison.InvariantCultureIgnoreCase) >= 0) >= 0;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Services/NewItemTemplateService.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/NewItemTemplateService.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Services/NewItemTemplateService.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,36 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using ICSharpCode.Core;
-using OSGeo.MapGuide.MaestroAPI;
-using System.Drawing;
-using OSGeo.MapGuide.MaestroAPI.Services;
 
 namespace Maestro.Base.Services
 {
-    using Res = Properties.Resources;
     using Maestro.Base.Templates;
+    using Maestro.Shared.UI;
     using System.IO;
-    using Maestro.Shared.UI;
 
     /// <summary>
     /// An application-level service for creating new resources from a set of pre-defined templates
@@ -73,7 +71,7 @@
         private UserItemTemplate[] ScanUserTemplates()
         {
             List<UserItemTemplate> tpls = new List<UserItemTemplate>();
-            
+
             //TODO: Store path in preferences
             string userTplPath = Path.Combine(FileUtility.ApplicationRootPath, "UserTemplates"); //NOXLATE
             if (Directory.Exists(userTplPath))
@@ -113,7 +111,7 @@
 
             internal TemplateSet(IEnumerable<ItemTemplate> templates)
             {
-                _templates = new Dictionary<string,List<ItemTemplate>>();
+                _templates = new Dictionary<string, List<ItemTemplate>>();
                 foreach (var tpl in templates)
                 {
                     if (!_templates.ContainsKey(tpl.Category))
@@ -131,7 +129,10 @@
             /// Gets the categories for the template set
             /// </summary>
             /// <returns></returns>
-            public IEnumerable<string> GetCategories() { return _templates.Keys; }
+            public IEnumerable<string> GetCategories()
+            {
+                return _templates.Keys;
+            }
 
             /// <summary>
             /// Gets the templates for the specified category
@@ -169,4 +170,4 @@
             return new TemplateSet(templates.ToArray());
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
+using Maestro.Base.Editor;
 using Maestro.Base.UI;
+using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Base.Editor;
 using OSGeo.MapGuide.MaestroAPI.Resource;
-using Maestro.Shared.UI;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 
 namespace Maestro.Base.Services

Modified: trunk/Tools/Maestro/Maestro.Base/Services/ServerConnectionManager.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/ServerConnectionManager.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Services/ServerConnectionManager.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI;
-using ICSharpCode.Core;
 using System.ComponentModel;
-using Maestro.Shared.UI;
 
 namespace Maestro.Base.Services
 {
@@ -33,6 +35,7 @@
     /// <param name="sender"></param>
     /// <param name="e"></param>
     public delegate void ServerConnectionEventHandler(object sender, ServerConnectionEventArgs e);
+
     /// <summary>
     /// Defines a method that handles connection pre-removal
     /// </summary>
@@ -120,7 +123,7 @@
             base.Initialize();
             LoggingService.Info(Strings.Service_Init_Server_Connection_Manager);
         }
-        
+
         /// <summary>
         /// Gets the connection by its registered name
         /// </summary>
@@ -175,4 +178,4 @@
             return null;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Services/ServiceRegistry.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/ServiceRegistry.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Services/ServiceRegistry.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
+using Maestro.Base.Events;
+using Maestro.Shared.UI;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using ICSharpCode.Core;
-using Maestro.Shared.UI;
-using Maestro.Base.Events;
 
 namespace Maestro.Base.Services
 {
@@ -71,4 +73,4 @@
             return null;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Services/UrlLauncherService.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/UrlLauncherService.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Services/UrlLauncherService.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
-using System.Diagnostics;
-using Maestro.Base.UI;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Shared.UI;
 using Maestro.Editors.Preview;
+using Maestro.Shared.UI;
+using System.Diagnostics;
 
 namespace Maestro.Base.Services
 {
@@ -52,4 +50,4 @@
             Process.Start(url);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Services/ViewContentManager.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/ViewContentManager.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Services/ViewContentManager.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
+using Maestro.Shared.UI;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using ICSharpCode.Core;
-using Maestro.Base.UI;
-using Maestro.Shared.UI;
 
 namespace Maestro.Base.Services
 {
@@ -60,4 +61,4 @@
             return Workbench.Instance;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/ApplicationDefinitionItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/ApplicationDefinitionItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/ApplicationDefinitionItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using Res = Maestro.Base.Properties.Resources;
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
-using Maestro.Editors.Generic;
+using System;
+using Res = Maestro.Base.Properties.Resources;
 
 namespace Maestro.Base.Templates
 {
@@ -68,4 +68,4 @@
             return null;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/DrawingLayerDefinitionItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/DrawingLayerDefinitionItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/DrawingLayerDefinitionItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Res = Maestro.Base.Properties.Resources;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
-using Maestro.Editors.Generic;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.MaestroAPI.Services;
+using System;
+using Res = Maestro.Base.Properties.Resources;
 
 namespace Maestro.Base.Templates
 {
@@ -64,4 +65,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/DrawingSourceItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/DrawingSourceItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/DrawingSourceItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using Res = Maestro.Base.Properties.Resources;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
+using Res = Maestro.Base.Properties.Resources;
 
 namespace Maestro.Base.Templates
 {
@@ -44,4 +43,4 @@
             return ObjectFactory.CreateDrawingSource(conn);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/DwfLoadProcedureItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/DwfLoadProcedureItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/DwfLoadProcedureItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using Res = Maestro.Base.Properties.Resources;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
-using Maestro.Shared.UI;
 using OSGeo.MapGuide.ObjectModels.LoadProcedure;
 
 namespace Maestro.Base.Templates
@@ -62,4 +60,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/FeatureSourceItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/FeatureSourceItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/FeatureSourceItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using Res = Maestro.Base.Properties.Resources;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
-using Maestro.Editors.Common;
+using Res = Maestro.Base.Properties.Resources;
 
 namespace Maestro.Base.Templates
 {
@@ -56,4 +55,4 @@
             return null;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/ItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/ItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using Res = Maestro.Base.Properties.Resources;
 using System.Drawing;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Base.Templates
 {
@@ -87,4 +86,4 @@
             return this.Name.CompareTo(other.Name);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/MapDefinitionItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/MapDefinitionItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/MapDefinitionItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels;
+using System;
 using Res = Maestro.Base.Properties.Resources;
 
 namespace Maestro.Base.Templates
@@ -44,4 +44,4 @@
             return ObjectFactory.CreateMapDefinition(conn, new Version(1, 0, 0), Strings.NewMap);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/PrintLayoutItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/PrintLayoutItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/PrintLayoutItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using Res = Maestro.Base.Properties.Resources;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
+using Res = Maestro.Base.Properties.Resources;
 
 namespace Maestro.Base.Templates
 {
@@ -44,4 +43,4 @@
             return ObjectFactory.CreatePrintLayout(conn);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/RasterLayerDefinitionItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/RasterLayerDefinitionItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/RasterLayerDefinitionItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Generic;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
-using Res = Maestro.Base.Properties.Resources;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
-using Maestro.Editors.Generic;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using System;
+using Res = Maestro.Base.Properties.Resources;
 
 namespace Maestro.Base.Templates
 {
@@ -72,4 +73,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/SdfLoadProcedureItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/SdfLoadProcedureItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/SdfLoadProcedureItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using Res = Maestro.Base.Properties.Resources;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
-using Maestro.Shared.UI;
 using OSGeo.MapGuide.ObjectModels.LoadProcedure;
 
 namespace Maestro.Base.Templates
@@ -62,4 +60,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/ShpLoadProcedureItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/ShpLoadProcedureItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/ShpLoadProcedureItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using Res = Maestro.Base.Properties.Resources;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
-using Maestro.Shared.UI;
 using OSGeo.MapGuide.ObjectModels.LoadProcedure;
 
 namespace Maestro.Base.Templates
@@ -62,4 +60,4 @@
             return null;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/SymbolDefinitionItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/SymbolDefinitionItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/SymbolDefinitionItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using Res = Maestro.Base.Properties.Resources;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
+using System;
+using Res = Maestro.Base.Properties.Resources;
 
 namespace Maestro.Base.Templates
 {
@@ -77,4 +77,4 @@
             return ObjectFactory.CreateCompoundSymbol(conn, new Version(1, 0, 0), Strings.DefaultSymbolName, Strings.DefaultSymbolDescription);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/UserItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/UserItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/UserItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using Res = Maestro.Base.Properties.Resources;
-using System.IO;
 using OSGeo.MapGuide.MaestroAPI.Resource;
+using System.IO;
+using Res = Maestro.Base.Properties.Resources;
 
 namespace Maestro.Base.Templates
 {
@@ -66,4 +65,4 @@
             return res;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/VectorLayerDefinitionItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/VectorLayerDefinitionItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/VectorLayerDefinitionItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using Res = Maestro.Base.Properties.Resources;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
-using Maestro.Editors.Generic;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using System;
+using Res = Maestro.Base.Properties.Resources;
 
 namespace Maestro.Base.Templates
 {
@@ -64,4 +64,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/WebLayoutItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/WebLayoutItemTemplate.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/WebLayoutItemTemplate.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using Res = Maestro.Base.Properties.Resources;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
-using Maestro.Editors.Generic;
+using System;
+using Res = Maestro.Base.Properties.Resources;
 
 namespace Maestro.Base.Templates
 {
@@ -56,4 +56,4 @@
             return null;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Base.Services;
+using OSGeo.MapGuide.MaestroAPI;
 using System;
-using System.Drawing;
-using System.Collections;
-using System.ComponentModel;
+using System.Diagnostics;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Base.Services;
-using System.Diagnostics;
 
 namespace Maestro.Base.UI
 {
@@ -53,7 +53,9 @@
         /// <summary>
         /// Dummy function used to create a thread to read the default locale from
         /// </summary>
-        private void dummy_function() { }
+        private void dummy_function()
+        {
+        }
 
         private UrlLauncherService _launcher;
 
@@ -126,4 +128,4 @@
             _launcher.OpenUrl("https://github.com/lextm/sharpsnmplib/tree/master/WinFormsUI"); //NOXLATE
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/BoundsPicker.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/BoundsPicker.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/BoundsPicker.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,37 +1,35 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
 
 namespace Maestro.Base.UI
 {
     internal partial class BoundsPicker : Form
     {
         private string m_bounds;
+
         public string SRSBounds
         {
             get { return m_bounds; }
@@ -80,10 +78,10 @@
                     else
                         throw new Exception(Strings.BoundsPicker_MissingBoundsError);
                 }
-                catch(Exception ex)
+                catch (Exception ex)
                 {
                     string msg = NestedExceptionMessageProcessor.GetFullMessage(ex);
-                    MessageBox.Show(this, string.Format(Strings.BoundsPicker_BoundsDecodeError, msg), Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error); 
+                    MessageBox.Show(this, string.Format(Strings.BoundsPicker_BoundsDecodeError, msg), Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
                 }
             }
         }
@@ -110,7 +108,7 @@
             double temp;
             System.Globalization.CultureInfo localCI = System.Globalization.CultureInfo.CurrentUICulture;
             System.Globalization.CultureInfo usCI = System.Globalization.CultureInfo.InvariantCulture;
-            
+
             bool isUs = double.TryParse(MinX.Text, System.Globalization.NumberStyles.Float, usCI, out temp) &&
                 double.TryParse(MaxX.Text, System.Globalization.NumberStyles.Float, usCI, out temp) &&
                 double.TryParse(MinY.Text, System.Globalization.NumberStyles.Float, usCI, out temp) &&
@@ -155,6 +153,7 @@
                             return;
                         }
                         break;
+
                     case DialogResult.Cancel:
                         return;
                 }
@@ -172,7 +171,7 @@
                 m_bounds += " SRS=\"" + srs + "\""; //NOXLATE
             }
             m_bounds += " />"; //NOXLATE
-            
+
             this.DialogResult = DialogResult.OK;
             this.Close();
         }

Modified: trunk/Tools/Maestro/Maestro.Base/UI/BroadcastTextWriter.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/BroadcastTextWriter.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/BroadcastTextWriter.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Text;
-using System.IO;
 
 namespace Maestro.Base.UI
 {
@@ -53,7 +56,10 @@
             }
         }
 
-        private BroadcastTextWriter() : base() { } 
+        private BroadcastTextWriter()
+            : base()
+        {
+        }
 
         /// <summary>
         /// Raised when a log message is written
@@ -165,4 +171,4 @@
         /// </summary>
         public string Message { get; set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/ConfirmDeleteResourcesDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/ConfirmDeleteResourcesDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/ConfirmDeleteResourcesDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Base.UI
@@ -78,4 +77,4 @@
             this.DialogResult = System.Windows.Forms.DialogResult.Cancel;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/DirtyStateConfirmationDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/DirtyStateConfirmationDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/DirtyStateConfirmationDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,36 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors;
-using OSGeo.MapGuide.MaestroAPI.Resource.Comparison;
-using System.Collections;
 using Maestro.Editors.Diff;
 using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI.Resource.Comparison;
+using System;
 using System.IO;
+using System.Windows.Forms;
 
 namespace Maestro.Base.UI
 {
@@ -111,4 +107,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/ISiteExplorer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/ISiteExplorer.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/ISiteExplorer.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors;
-using Maestro.Shared.UI;
 
 namespace Maestro.Base.UI
 {
@@ -35,6 +35,7 @@
         /// Raised when the active connection has changed
         /// </summary>
         event EventHandler ActiveConnectionChanged;
+
         /// <summary>
         /// The name of the active <see cref="IServerConnection"/> associated with this site explorer. The active connection
         /// is the connection whose node or child nodes is currently selected
@@ -58,7 +59,7 @@
         void RefreshModel(string connectionName);
 
         /// <summary>
-        /// Refreshes the tree model from the specified resource id 
+        /// Refreshes the tree model from the specified resource id
         /// </summary>
         /// <param name="connectionName">The name of the connection</param>
         /// <param name="resId"></param>
@@ -138,14 +139,17 @@
         /// Indicate that the node has been copied and placed on the clipboard
         /// </summary>
         IndicateCopy,*/
+
         /// <summary>
         /// Highlight the affected node with a pre-defined back color to indicate open
         /// </summary>
         HighlightOpen,
+
         /// <summary>
         /// Highlight the affected node with a pre-defined back color to indicate dirty state
         /// </summary>
         HighlightDirty,
+
         /// <summary>
         /// Reset node to default styles
         /// </summary>

Modified: trunk/Tools/Maestro/Maestro.Base/UI/IncompatibleResourcesDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/IncompatibleResourcesDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/IncompatibleResourcesDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Base.UI
@@ -47,4 +44,4 @@
             this.Close();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/LabelLocalizationDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/LabelLocalizationDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/LabelLocalizationDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using System.Xml;
-using ICSharpCode.Core;
 
 namespace Maestro.Base.UI
 {
@@ -100,7 +99,10 @@
             this.Translate = false;
         }
 
-        public void AddNode(XmlNode node) { _element.Add(node); }
+        public void AddNode(XmlNode node)
+        {
+            _element.Add(node);
+        }
 
         private bool _translate;
 
@@ -157,4 +159,4 @@
 
         public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/MessageViewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/MessageViewer.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/MessageViewer.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
-using System.IO;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
+using System;
+using System.IO;
+using System.Windows.Forms;
 
 namespace Maestro.Base.UI
 {
@@ -45,13 +43,13 @@
         protected override void OnLoad(EventArgs e)
         {
             base.OnLoad(e);
-            
+
             var btw = BroadcastTextWriter.Instance;
             btw.LogMessage += WeakEventHandler.Wrap<LogBroadcastEventHandler>(OnLogMessage, (eh) => btw.LogMessage -= eh);
             btw.FlushMessages();
         }
 
-        void OnLogMessage(object sender, LogMessageEventArgs msg)
+        private void OnLogMessage(object sender, LogMessageEventArgs msg)
         {
             if (!txtMessages.IsDisposed)
             {
@@ -86,4 +84,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/NewFolderDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/NewFolderDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/NewFolderDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Base.UI
@@ -31,7 +30,7 @@
     {
         private List<string> _folderNames;
 
-        public NewFolderDialog(string name, string [] folderNames)
+        public NewFolderDialog(string name, string[] folderNames)
         {
             InitializeComponent();
             _folderNames = new List<string>(folderNames);
@@ -68,4 +67,4 @@
             btnCreate.Enabled = true;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/NewResourceDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/NewResourceDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/NewResourceDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI.Services;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Base.Services;
 using Maestro.Base.Templates;
 using OSGeo.MapGuide.MaestroAPI;
-using System.Threading;
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
 
 namespace Maestro.Base.UI
 {
@@ -183,7 +179,6 @@
 
                     lstTemplates.Items.Add(li);
                 }
-                
             }
         }
 
@@ -256,4 +251,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/OpenResourceIdDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/OpenResourceIdDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/OpenResourceIdDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Base.Services;
+using Maestro.Editors.Generic;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Base.Services;
-using System.Collections;
-using Maestro.Editors.Generic;
 
 namespace Maestro.Base.UI
 {
@@ -96,4 +93,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/OutboundRequestViewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/OutboundRequestViewer.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/OutboundRequestViewer.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using Maestro.Shared.UI;
-using System.IO;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Base.UI.Preferences;
+using Maestro.Shared.UI;
+using System;
+using System.IO;
+using System.Windows.Forms;
 
 namespace Maestro.Base.UI
 {
@@ -62,7 +60,7 @@
             base.OnLoad(e);
         }
 
-        void OnRequestDispatched(object sender, OSGeo.MapGuide.MaestroAPI.RequestEventArgs e)
+        private void OnRequestDispatched(object sender, OSGeo.MapGuide.MaestroAPI.RequestEventArgs e)
         {
             string msg = string.Format("[{0}]: {1}", DateTime.Now.ToString("dd MMM yyyy hh:mm:ss"), e.Data); //NOXLATE
 
@@ -110,4 +108,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/Packaging/CreatePackageDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/Packaging/CreatePackageDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/Packaging/CreatePackageDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Generic;
 using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
+using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Windows.Forms;
 
 namespace Maestro.Base.UI.Packaging
 {
@@ -82,7 +81,7 @@
         public string[] ResourceIds
         {
             get
-            { 
+            {
                 var ids = new HashSet<string>(txtResourceIdList.Lines);
                 return ids.ToArray();
             }
@@ -91,8 +90,8 @@
         public string FolderToPackage
         {
             get { return txtResourcePath.Text; }
-            set 
-            { 
+            set
+            {
                 txtResourcePath.Text = value;
                 CheckSubmitState();
             }
@@ -101,10 +100,10 @@
         public string OutputFileName
         {
             get { return txtPackageFilename.Text; }
-            set 
-            { 
-                txtPackageFilename.Text = value; 
-                CheckSubmitState(); 
+            set
+            {
+                txtPackageFilename.Text = value;
+                CheckSubmitState();
             }
         }
 
@@ -115,7 +114,7 @@
             {
                 if (chkRestorePath.Checked)
                 {
-                    txtRestorePath.Text = value; 
+                    txtRestorePath.Text = value;
                     CheckSubmitState();
                 }
             }
@@ -130,8 +129,8 @@
         public bool RemoveTargetFolderOnRestore
         {
             get { return chkRemoveTargetFolderOnRestore.Checked; }
-            set 
-            { 
+            set
+            {
                 chkRemoveTargetFolderOnRestore.Checked = value;
                 CheckSubmitState();
             }
@@ -212,7 +211,7 @@
             txtRestorePath.Enabled = btnBrowseRestorePath.Enabled = chkRestorePath.Checked;
         }
 
-        void CheckSubmitState()
+        private void CheckSubmitState()
         {
             btnOK.Enabled =
                 SelectedTypes.Length > 0 &&
@@ -254,4 +253,4 @@
             btnReadFromFile.Enabled = rdResourceList.Checked;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/Preferences/ConfigProperties.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/Preferences/ConfigProperties.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/Preferences/ConfigProperties.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
+using System.Drawing;
+using System.IO;
 using Props = ICSharpCode.Core.PropertyService;
-using System.IO;
-using System.Drawing;
 
 namespace Maestro.Base.UI.Preferences
 {
@@ -106,7 +106,7 @@
         /// Show the tip of the day on startup
         /// </summary>
         public const string ShowTipOfTheDay = "General.ShowTipOfTheDay"; //NOXLATE
-        
+
         /// <summary>
         /// The path to Maestro.LiveMapEditor.exe
         /// </summary>
@@ -181,7 +181,7 @@
         /// Default setting for using local previews
         /// </summary>
         public static bool DefaultUseLocalPreview { get { return true; } }
-        
+
         /// <summary>
         /// Default setting for adding debug watermarks
         /// </summary>
@@ -232,4 +232,4 @@
         /// </summary>
         public static string DefaultUserTemplatesDirectory { get { return Path.Combine(FileUtility.ApplicationRootPath, "UserTemplates"); } } //NOXLATE
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/Preferences/EditorPreferencesCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/Preferences/EditorPreferencesCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/Preferences/EditorPreferencesCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,11 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using Props = ICSharpCode.Core.PropertyService;
 using System.Windows.Forms;
+using Props = ICSharpCode.Core.PropertyService;
 
 namespace Maestro.Base.UI.Preferences
 {
@@ -91,4 +86,4 @@
             ConfigProperties.ApplyEditorDefaults();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
+using Maestro.Shared.UI;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Data;
-using System.Text;
+using System.IO;
 using System.Windows.Forms;
-using Maestro.Shared.UI;
 using Props = ICSharpCode.Core.PropertyService;
-using ICSharpCode.Core;
-using System.IO;
 
 namespace Maestro.Base.UI.Preferences
 {
@@ -58,7 +57,7 @@
             chkOutbound.Checked = outb;
             var totd = Props.Get(ConfigProperties.ShowTipOfTheDay, ConfigProperties.DefaultShowTipOfTheDay);
             chkShowTipOfTheDay.Checked = totd;
-            
+
             txtFsPreview.Text = Props.Get(ConfigProperties.LocalFsPreviewPath, ConfigProperties.DefaultLocalFsPreviewPath);
             txtMgCooker.Text = Props.Get(ConfigProperties.MgCookerPath, ConfigProperties.DefaultMgCookerPath);
             txtRtMapInspector.Text = Props.Get(ConfigProperties.RtMapInspectorPath, ConfigProperties.DefaultRtMapInspectorPath);
@@ -66,7 +65,7 @@
 
             cmbOpenedColor.CurrentColor = Props.Get(ConfigProperties.OpenColor, Color.LightGreen);
             cmbModifiedColor.CurrentColor = Props.Get(ConfigProperties.DirtyColor, Color.Pink);
-        } 
+        }
 
         public string Title
         {
@@ -185,4 +184,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/Preferences/IPreferenceSheet.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/Preferences/IPreferenceSheet.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/Preferences/IPreferenceSheet.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Windows.Forms;
 
 namespace Maestro.Base.UI.Preferences
@@ -34,18 +34,21 @@
         /// </summary>
         /// <value>The title.</value>
         string Title { get; }
+
         /// <summary>
         /// Gets the content control.
         /// </summary>
         /// <value>The content control.</value>
         Control ContentControl { get; }
+
         /// <summary>
         /// Applies the changes.
         /// </summary>
         bool ApplyChanges();
+
         /// <summary>
         /// Applies default values
         /// </summary>
         void ApplyDefaults();
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/Preferences/OptionsDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/Preferences/OptionsDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/Preferences/OptionsDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using ICSharpCode.Core;
 
 namespace Maestro.Base.UI.Preferences
 {
@@ -102,4 +101,4 @@
             return restart;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/ProfilingDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/ProfilingDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/ProfilingDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,40 +1,39 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Mapping;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Mapping;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using Maestro.Shared.UI;
-using ICSharpCode.Core;
 
 namespace Maestro.Base.UI
 {
@@ -116,7 +115,6 @@
             }
         }
 
-
         private void ProfileLayerDefinition(ILayerDefinition ldef)
         {
             //TODO: This was a line-by-line port from 2.x to match the 3.x APIs
@@ -146,7 +144,7 @@
                         return;
 
                     var mpsvc = (IMappingService)m_connection.GetService((int)ServiceType.Mapping);
-                    
+
                     var map = mpsvc.CreateMap(mdef);
                     using (new Timer(Strings.Prof_LogMessageIdentifyFetching, backgroundWorker))
                     {
@@ -209,7 +207,7 @@
                                     mdf.CoordinateSystem = lst.SpatialContext[0].CoordinateSystemWkt;
                                     if (string.IsNullOrEmpty(m_tempmap.CoordinateSystem))
                                         mdf.CoordinateSystem = @"LOCAL_CS[""*XY-M*"", LOCAL_DATUM[""*X-Y*"", 10000], UNIT[""Meter"", 1], AXIS[""X"", EAST], AXIS[""Y"", NORTH]]"; //NOXLATE
-                                    
+
                                     double llx = double.Parse(lst.SpatialContext[0].Extent.LowerLeftCoordinate.X, System.Globalization.NumberStyles.Float, System.Globalization.CultureInfo.InvariantCulture);
                                     double lly = double.Parse(lst.SpatialContext[0].Extent.LowerLeftCoordinate.Y, System.Globalization.NumberStyles.Float, System.Globalization.CultureInfo.InvariantCulture); ;
                                     double urx = double.Parse(lst.SpatialContext[0].Extent.UpperRightCoordinate.X, System.Globalization.NumberStyles.Float, System.Globalization.CultureInfo.InvariantCulture); ;
@@ -219,7 +217,7 @@
                                 }
 
                                 SetTempLayer(mdf, tmp1);
-                                
+
                                 var mpsvc = (IMappingService)m_connection.GetService((int)ServiceType.Mapping);
                                 //We cannot flub this anymore. AIMS 2012 demands the Map Definition id specified checks out
                                 mdf.ResourceID = "Session:" + m_connection.SessionID + "//ProfileTest.MapDefinition"; //NOXLATE
@@ -250,7 +248,6 @@
                                 catch { }
                             }
                         }
-
                     }
                 }
             }
@@ -374,7 +371,7 @@
             }
         }
 
-        private class Timer : IDisposable 
+        private class Timer : IDisposable
         {
             private string m_text;
             private bool m_isDisposed;
@@ -403,7 +400,7 @@
                 }
             }
 
-            #endregion
+            #endregion IDisposable Members
         }
 
         private void Profiling_Load(object sender, EventArgs e)
@@ -481,6 +478,5 @@
                 }
             }
         }
-
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/RenameItemDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/RenameItemDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/RenameItemDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Maestro.Base.Services;
 
 namespace Maestro.Base.UI
 {
@@ -95,4 +93,4 @@
                 chkOverwrite.Checked = true;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/RepositoryTreeModel.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/RepositoryTreeModel.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/RepositoryTreeModel.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using Aga.Controls.Tree;
+using Maestro.Base.Services;
 using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels.Common;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
 using System.Drawing;
-using System.Diagnostics;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using System.Collections.ObjectModel;
-using Maestro.Base.Services;
 
 namespace Maestro.Base.UI
 {
@@ -52,7 +53,6 @@
             this.ResourceId = item.ResourceId;
             this.ResourceType = item.ResourceType;
             this.Name = item.Name; //set name last because update logic requires other properties be set already
-            
 
             if (this.IsRoot)
             {
@@ -65,36 +65,47 @@
                     case "DrawingSource":
                         this.Icon = Properties.Resources.blueprints;
                         break;
+
                     case "FeatureSource":
                         this.Icon = Properties.Resources.database_share;
                         break;
+
                     case "Folder":
                         this.Icon = Properties.Resources.folder_horizontal;
                         break;
+
                     case "LayerDefinition":
                         this.Icon = Properties.Resources.layer;
                         break;
+
                     case "MapDefinition":
                         this.Icon = Properties.Resources.map;
                         break;
+
                     case "WebLayout":
                         this.Icon = Properties.Resources.application_browser;
                         break;
+
                     case "ApplicationDefinition":
                         this.Icon = Properties.Resources.applications_stack;
                         break;
+
                     case "SymbolLibrary":
                         this.Icon = Properties.Resources.images_stack;
                         break;
+
                     case "PrintLayout":
                         this.Icon = Properties.Resources.printer;
                         break;
+
                     case "SymbolDefinition":
                         this.Icon = Properties.Resources.marker;
                         break;
+
                     case "WatermarkDefinition":
                         this.Icon = Properties.Resources.water;
                         break;
+
                     default:
                         this.Icon = Properties.Resources.document;
                         break;
@@ -152,7 +163,7 @@
         /// </summary>
         public string NameQualified
         {
-            get 
+            get
             {
                 if (this.ResourceType == ResourceTypes.Folder.ToString())
                     return this.Name;
@@ -377,8 +388,8 @@
         internal bool IsOpen
         {
             get { return _open; }
-            set 
-            { 
+            set
+            {
                 _open = value;
                 _dirty = !value;
                 this.NotifyNodesChanged();
@@ -388,8 +399,8 @@
         internal bool IsDirty
         {
             get { return _dirty; }
-            set 
-            { 
+            set
+            {
                 _dirty = value;
                 _open = !value;
                 this.NotifyNodesChanged();
@@ -397,7 +408,7 @@
         }
 
         /// <summary>
-        /// Defines valid clipboard actions for Site Explorer 
+        /// Defines valid clipboard actions for Site Explorer
         /// </summary>
         public enum ClipboardAction
         {
@@ -405,10 +416,12 @@
             /// The node was copied
             /// </summary>
             Copy,
+
             /// <summary>
             /// The node was cut
             /// </summary>
             Cut,
+
             /// <summary>
             /// No clipboard action applied
             /// </summary>
@@ -416,7 +429,7 @@
         }
 
         private ClipboardAction _action = ClipboardAction.None;
-        
+
         /// <summary>
         /// Gets the clipboard state of this item
         /// </summary>
@@ -461,7 +474,6 @@
         }
     }
 
-
     /// <summary>
     /// Defines the repository model for the treeview
     /// </summary>
@@ -606,7 +618,7 @@
                 Debug.Assert(!string.IsNullOrEmpty(current.ConnectionName));
                 return current.ConnectionName;
             }
-            else 
+            else
             {
                 Debug.Assert(!string.IsNullOrEmpty(item.ConnectionName));
                 return item.ConnectionName;
@@ -618,11 +630,11 @@
         /// </summary>
         public override void Refresh()
         {
-            //We have to override this because the base impl does not 
+            //We have to override this because the base impl does not
             //preserve the tree path of the selected node (and thus expand
             //all the nodes from the root to this node)
             //
-            //Which is also why we need to pass a reference to 
+            //Which is also why we need to pass a reference to
             //the TreeViewAdv in the ctor
             var selected = _tree.GetPath(_tree.SelectedNode);
             OnStructureChanged(new TreePathEventArgs(selected));
@@ -695,4 +707,4 @@
             return GetPath(current);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/ResourceDependencyListDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/ResourceDependencyListDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/ResourceDependencyListDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Base.UI
@@ -87,4 +85,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/ResourceHeaderXmlDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/ResourceHeaderXmlDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/ResourceHeaderXmlDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels.Common;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
+using System.IO;
 using System.Windows.Forms;
 using System.Xml.Serialization;
-using System.IO;
-using OSGeo.MapGuide.ObjectModels.Common;
-using ICSharpCode.Core;
-using OSGeo.MapGuide.MaestroAPI.Services;
 
 namespace Maestro.Base.UI
 {
@@ -57,7 +55,7 @@
 
         public Stream XmlStream { get; set; }
 
-        bool isFolder;
+        private bool isFolder;
 
         public void LoadResourceHeader(ResourceDocumentHeaderType docHeader)
         {
@@ -100,4 +98,4 @@
             this.DialogResult = DialogResult.Cancel;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/ResourceIconCache.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/ResourceIconCache.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/ResourceIconCache.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows.Forms;
-using System.Drawing;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
+using System.Windows.Forms;
 
 namespace Maestro.Base.UI
 {
@@ -65,13 +64,13 @@
         private ImageList _small;
         private ImageList _large;
 
-        private ResourceIconCache() 
+        private ResourceIconCache()
         {
             _small = new ImageList();
             _large = new ImageList();
         }
 
-        const string UNKNOWN = "UNKNOWN"; //NOXLATE
+        private const string UNKNOWN = "UNKNOWN"; //NOXLATE
 
         /// <summary>
         /// Creates the default image lists
@@ -127,6 +126,7 @@
                 case "SymbolLibrary":
                 case "PrintLayout":
                     return rt.ToString();
+
                 default:
                     return UNKNOWN;
             }
@@ -152,7 +152,7 @@
         /// </summary>
         public ImageList SmallImageList
         {
-            get { return _small;  }
+            get { return _small; }
         }
 
         /// <summary>
@@ -163,4 +163,4 @@
             get { return _large; }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/ResourceIdNavigator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/ResourceIdNavigator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/ResourceIdNavigator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,22 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.Editor;
 using Maestro.Base.Services;
@@ -24,9 +27,6 @@
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Base.UI
@@ -52,8 +52,8 @@
         private ISiteExplorer _siteExp;
         private ViewContentManager _viewMgr;
 
-        public ResourceIdNavigator(ServerConnectionManager connMgr, 
-                                   OpenResourceManager omgr, 
+        public ResourceIdNavigator(ServerConnectionManager connMgr,
+                                   OpenResourceManager omgr,
                                    ViewContentManager viewMgr,
                                    ISiteExplorer siteExp)
         {
@@ -103,8 +103,8 @@
             UpdateConnectionList();
             UpdateNavigationState();
 
-            _strip.Items.AddRange(new ToolStripItem[] 
-            { 
+            _strip.Items.AddRange(new ToolStripItem[]
+            {
                 _resIdLabel,
                 _cmbResourceId,
                 _atLabel,
@@ -114,7 +114,7 @@
             });
         }
 
-        void OnSiteExplorerItemsSelected(object sender, RepositoryItemEventArgs e)
+        private void OnSiteExplorerItemsSelected(object sender, RepositoryItemEventArgs e)
         {
             if (e.Items == null)
                 return;
@@ -130,7 +130,7 @@
             }
         }
 
-        void OnViewActivated(object sender, ViewEventArgs e)
+        private void OnViewActivated(object sender, ViewEventArgs e)
         {
             var ed = e.View as IEditorViewContent;
             if (ed != null && !ed.IsNew)
@@ -145,7 +145,7 @@
             }
         }
 
-        void OnResourceIdKeyUp(object sender, KeyEventArgs e)
+        private void OnResourceIdKeyUp(object sender, KeyEventArgs e)
         {
             if (_btnGo.Enabled && _btnOpenAsXml.Enabled && (e.KeyCode == Keys.Enter || e.KeyCode == Keys.Return))
             {
@@ -153,12 +153,12 @@
             }
         }
 
-        void OnActiveConnectionChanged(object sender, EventArgs e)
+        private void OnActiveConnectionChanged(object sender, EventArgs e)
         {
             _cmbActiveConnections.ToolTipText = (string)_cmbActiveConnections.SelectedItem ?? string.Empty;
         }
 
-        void OnToolStripLayout(object sender, LayoutEventArgs e)
+        private void OnToolStripLayout(object sender, LayoutEventArgs e)
         {
             int width = _strip.DisplayRectangle.Width;
             foreach (ToolStripItem tsi in _strip.Items)
@@ -172,7 +172,7 @@
             _cmbResourceId.Width = Math.Max(0, width - _cmbResourceId.Margin.Horizontal);
         }
 
-        void OnResourceIdChanged(object sender, EventArgs e)
+        private void OnResourceIdChanged(object sender, EventArgs e)
         {
             UpdateNavigationState();
         }
@@ -182,22 +182,22 @@
             _btnGo.Enabled = _btnOpenAsXml.Enabled = ResourceIdentifier.Validate(_cmbResourceId.Text) && !ResourceIdentifier.IsFolderResource(_cmbResourceId.Text);
         }
 
-        void OnConnectionRemoved(object sender, ServerConnectionEventArgs e)
+        private void OnConnectionRemoved(object sender, ServerConnectionEventArgs e)
         {
             UpdateConnectionList();
         }
 
-        void OnConnectionAdded(object sender, ServerConnectionEventArgs e)
+        private void OnConnectionAdded(object sender, ServerConnectionEventArgs e)
         {
             UpdateConnectionList();
         }
 
-        void btnGo_Click(object sender, EventArgs e)
+        private void btnGo_Click(object sender, EventArgs e)
         {
             DoNavigate(false);
         }
 
-        void btnOpenAsXml_Click(object sender, EventArgs e)
+        private void btnOpenAsXml_Click(object sender, EventArgs e)
         {
             DoNavigate(true);
         }
@@ -262,4 +262,4 @@
 
         public ToolStrip NavigatorToolStrip { get { return _strip; } }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/ResourcePropertiesDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/ResourcePropertiesDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/ResourcePropertiesDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,42 +1,40 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using ICSharpCode.Core;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Base.Services;
+using Maestro.Editors.Common;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Exceptions;
 using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.Common;
 using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using Maestro.Editors.Common;
-using Maestro.Base.Services;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows.Forms;
 
 namespace Maestro.Base.UI
 {
@@ -84,7 +82,7 @@
         private object m_lock = new object();
         private volatile System.Threading.Thread m_backgroundThread = null;
         private bool m_hasLoadedRefs = false;
-        
+
         private string m_openResource = null;
 
         /// <summary>
@@ -196,7 +194,6 @@
                     tabControl1.Controls.Remove(c);
                     c.Top += tabControl1.Top;
                     this.Controls.Add(c);
-
                 }
 
                 this.Controls.Remove(tabControl1);
@@ -204,7 +201,6 @@
 
             this.Text = m_resourceId;
             UseInherited_CheckedChanged(null, null);
-
         }
 
         private void UpdateWFSDisplay()
@@ -311,9 +307,11 @@
                 case PermissionsType.rw:
                     lvi.ImageIndex = RWUSER;
                     break;
+
                 case PermissionsType.r:
                     lvi.ImageIndex = ROUSER;
                     break;
+
                 case PermissionsType.n:
                     lvi.ImageIndex = NOUSER;
                     break;
@@ -332,9 +330,11 @@
                 case PermissionsType.rw:
                     lvi.ImageIndex = RWGROUP;
                     break;
+
                 case PermissionsType.r:
                     lvi.ImageIndex = ROGROUP;
                     break;
+
                 case PermissionsType.n:
                     lvi.ImageIndex = NOGROUP;
                     break;
@@ -902,13 +902,13 @@
         {
             try
             {
-                lock(m_lock)
+                lock (m_lock)
                     m_backgroundThread = System.Threading.Thread.CurrentThread;
 
                 string resourceId = (ResourceIdentifier)e.Argument;
 
                 List<string> lst = new List<string>();
-                foreach (string s in  m_connection.ResourceService.EnumerateResourceReferences(resourceId).ResourceId)
+                foreach (string s in m_connection.ResourceService.EnumerateResourceReferences(resourceId).ResourceId)
                     if (!lst.Contains(s))
                         lst.Add(s);
 
@@ -925,7 +925,7 @@
                         r.Add(s.Value);
                 e.Result = new object[] { lst, r };
             }
-            catch(System.Threading.ThreadAbortException)
+            catch (System.Threading.ThreadAbortException)
             {
                 System.Threading.Thread.ResetAbort();
                 e.Cancel = true;
@@ -933,7 +933,7 @@
             }
             finally
             {
-                lock(m_lock)
+                lock (m_lock)
                     m_backgroundThread = null;
             }
         }
@@ -1136,4 +1136,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/SiteExplorer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/SiteExplorer.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/SiteExplorer.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,42 +1,42 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using ICSharpCode.Core.WinForms;
+//
+
+#endregion Disclaimer / License
+
 using Aga.Controls.Tree;
-using Maestro.Base.Services;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using ICSharpCode.Core;
-using Maestro.Base.UI.Preferences;
-using Maestro.Shared.UI;
-using Maestro.Base.Commands.SiteExplorer;
+using ICSharpCode.Core.WinForms;
 using Maestro.Base.Commands;
-using System.Linq;
+using Maestro.Base.Commands.SiteExplorer;
+using Maestro.Base.Services;
+using Maestro.Base.UI.Preferences;
 using Maestro.Editors;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.CrossConnection;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Windows.Forms;
 
 namespace Maestro.Base.UI
 {
@@ -69,7 +69,7 @@
             wb.ActiveDocumentChanged += WeakEventHandler.Wrap(OnActiveDocumentChanged, (eh) => wb.ActiveDocumentChanged -= eh);
         }
 
-        void OnActiveDocumentChanged(object sender, EventArgs e)
+        private void OnActiveDocumentChanged(object sender, EventArgs e)
         {
             Workbench wb = Workbench.Instance;
             var ed = wb.ActiveEditor;
@@ -82,7 +82,7 @@
             }
         }
 
-        void OnIdle(object sender, EventArgs e)
+        private void OnIdle(object sender, EventArgs e)
         {
             foreach (var item in tsSiteExplorer.Items)
             {
@@ -151,7 +151,6 @@
 
         protected override void OnLoad(EventArgs e)
         {
-            
         }
 
         public override bool AllowUserClose
@@ -173,7 +172,7 @@
         public void FullRefresh()
         {
             _model.FullRefresh();
-            foreach(var node in trvResources.Root.Children)
+            foreach (var node in trvResources.Root.Children)
             {
                 node.Expand();
             }
@@ -194,7 +193,7 @@
 
                 //If this node is not initially expanded, we get NRE on refresh
                 ExpandNode(connectionName, resId);
-                
+
                 var path = _model.GetPathFromResourceId(connectionName, resId);
                 while (path == null)
                 {
@@ -277,10 +276,9 @@
             }
         }
 
-
         public RepositoryItem[] SelectedItems
         {
-            get 
+            get
             {
                 List<RepositoryItem> items = new List<RepositoryItem>();
                 if (trvResources.SelectedNodes.Count > 0)
@@ -324,7 +322,6 @@
             }
         }
 
-
         public void ExpandNode(string connectionName, string folderId)
         {
             if (StringConstants.RootIdentifier.Equals(folderId))
@@ -385,9 +382,11 @@
                         case NodeFlagAction.HighlightDirty:
                             item.IsDirty = true;
                             break;
+
                         case NodeFlagAction.HighlightOpen:
                             item.IsOpen = true;
                             break;
+
                         case NodeFlagAction.None:
                             item.Reset();
                             break;
@@ -397,7 +396,7 @@
             }
         }
 
-        void OnNodeDrawText(object sender, Aga.Controls.Tree.NodeControls.DrawEventArgs e)
+        private void OnNodeDrawText(object sender, Aga.Controls.Tree.NodeControls.DrawEventArgs e)
         {
             if (e.Node.Tag == null)
                 return;
@@ -430,7 +429,6 @@
                     var ri = (RepositoryItem)n.Tag;
                     conn = _connManager.GetConnection(ri.ConnectionName);
                     rids.Add(new RepositoryHandle(new ResourceIdentifier(ri.ResourceId), conn));
-
                 }
                 trvResources.DoDragDrop(rids.ToArray(), DragDropEffects.All);
             }
@@ -483,7 +481,7 @@
                     {
                         /*
                          * Consider the following layout:
-                         * 
+                         *
                          * ConnectionA (Root):
                          *      Samples
                          *          Sheboygan
@@ -493,78 +491,77 @@
                          *                  *.LayerDefinition
                          *              Maps
                          *                  *.MapDefinition
-                         * 
+                         *
                          * ConnectionB (Root):
                          *      Foo
                          *      Bar
                          *          Snafu
-                         * 
+                         *
                          * These are the possible scenarios and outcomes:
-                         * 
+                         *
                          * Case 1 - Copy folder Samples/Sheboygan/Data into ConnectionB root:
-                         * 
+                         *
                          * Expect:
-                         * 
+                         *
                          * ConnectionB (Root):
                          *     Data
                          *          *.FeatureSource
                          *     Foo
                          *     Bar
                          *          Snafu
-                         * 
+                         *
                          * Case 2 - Copy Samples/Sheboygan/Data/*.FeatureSource into ConnectionB root:
-                         * 
+                         *
                          * Expect:
-                         * 
+                         *
                          * ConnectionB (Root):
                          *     *.FeatureSource
                          *     Foo
                          *     Bar
                          *          Snafu
-                         *          
+                         *
                          * Case 3 - Copy Samples/Sheboygan/Data/*.FeatureSource into Connection B/Foo:
-                         * 
+                         *
                          * Expect:
-                         * 
+                         *
                          * ConnectionB (Root):
                          *      Foo
                          *          *.FeatureSource
                          *      Bar
                          *          Snafu
-                         *          
+                         *
                          * Case 4 - Copy Samples/Sheboygan/Data into Connection B/Foo:
-                         * 
+                         *
                          * Expect:
-                         * 
+                         *
                          * ConnectionB (Root):
                          *      Foo
                          *          Data
                          *              *.FeatureSource
                          *      Bar
                          *          Snafu
-                         *          
+                         *
                          * Case 5 - Copy Samples/Sheboygan/Data into Connection B/Bar/Snafu:
-                         * 
+                         *
                          * Expect:
-                         * 
+                         *
                          * ConnectionB (Root):
                          *      Foo
                          *      Bar
                          *          Snafu
                          *              Data
                          *                  *.FeatureSource
-                         * 
+                         *
                          * Case 6 - Copy Samples/Sheboygan/Data/*.FeatureSource into Connection B/Bar/Snafu:
-                         * 
+                         *
                          * ConnectionB (Root):
                          *      Foo
                          *      Bar
                          *          Snafu
                          *              *.FeatureSource
-                         * 
+                         *
                          */
 
-
                         if (data.All(x => x.ResourceId.IsFolder))
                         {
                             if (data.Length > 1)
@@ -604,7 +601,6 @@
                     sourceIds.AddRange(GetFullResourceList(sourceConn, resId));
                 else
                     sourceIds.Add(resId);
-
             }
 
             var targets = new List<string>();
@@ -642,7 +638,7 @@
             var result = (string[])dlg.RunOperationAsync(wb, worker);
             RefreshModel(targetConn.DisplayName, folderId);
             ExpandNode(targetConn.DisplayName, folderId);
-            return result; 
+            return result;
         }
 
         internal static string GetCommonParent(RepositoryHandle[] data)
@@ -781,7 +777,7 @@
             // (eg. Create a Feature Source from a dragged SDF file)
         }
 
-        private string [] MoveResourcesWithinConnection(string connectionName, ICollection<string> resIds, string folderId)
+        private string[] MoveResourcesWithinConnection(string connectionName, ICollection<string> resIds, string folderId)
         {
             var wb = Workbench.Instance;
             var notMovedToTarget = new List<string>();
@@ -871,7 +867,7 @@
         {
             //Note: Even though the attached context menu has the shortcuts specified
             //for Cut/Copy/Paste, I'm guessing the TreeViewAdv control is muffling the
-            //event. Nevertheless this handler's got it covered and keeping those 
+            //event. Nevertheless this handler's got it covered and keeping those
             //shortcuts there is useful as a visual reference, even if they don't work
             //the original way.
 
@@ -884,9 +880,11 @@
                     case Keys.C:
                         new CopyCommand().Run();
                         break;
+
                     case Keys.X:
                         new CutCommand().Run();
                         break;
+
                     case Keys.V:
                         new PasteCommand().Run();
                         break;
@@ -899,4 +897,4 @@
             get { return _connManager.GetConnectionNames().ToArray(); }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/SiteExplorerDragDropHandler.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/SiteExplorerDragDropHandler.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/SiteExplorerDragDropHandler.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Aga.Controls.Tree;
+using Maestro.Base.Services;
+using Maestro.Editors.Common;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Linq;
 using System.Windows.Forms;
-using Maestro.Base.Services;
-using Maestro.Shared.UI;
-using Aga.Controls.Tree;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Common;
 
 namespace Maestro.Base.UI
 {
@@ -54,7 +56,7 @@
             string folderId = StringConstants.RootIdentifier;
             IServerConnection conn = null;
             var mgr = ServiceRegistry.GetService<ServerConnectionManager>();
-                
+
             if (droppedNode != null)
             {
                 var ri = droppedNode.Tag as RepositoryItem;
@@ -114,4 +116,4 @@
                 sender.RefreshModel(conn.DisplayName, folderId);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/TestResourceCompatibilityDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/TestResourceCompatibilityDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/TestResourceCompatibilityDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Base.UI
 {
@@ -58,4 +55,4 @@
             lblVersion.Text = this.SelectedVersion.ToString();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/TipOfTheDayDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/TipOfTheDayDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/TipOfTheDayDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.Core;
 using Maestro.Base.UI.Preferences;
-using System.Xml;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Threading;
+using System.Windows.Forms;
+using System.Xml;
 
 namespace Maestro.Base.UI
 {
@@ -101,7 +100,7 @@
                 + _tips[index];
         }
 
-        void chkShowTip_CheckedChanged(object sender, EventArgs e)
+        private void chkShowTip_CheckedChanged(object sender, EventArgs e)
         {
             PropertyService.Set(ConfigProperties.ShowTipOfTheDay, chkShowTip.Checked);
         }
@@ -135,4 +134,4 @@
             txtTip.Text = GetTip(_tipIndex);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/UI/ValidationResultsDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/ValidationResultsDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/UI/ValidationResultsDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.Linq;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
 
 namespace Maestro.Base
 {
@@ -58,8 +56,8 @@
         public ValidationResultsDialog(string resourceId, ValidationIssue[] issues, Action<IResource> openAction)
             : this(
                 new List<KeyValuePair<string, ValidationIssue[]>>(
-                    new KeyValuePair<string, ValidationIssue[]>[] { 
-                        new KeyValuePair<string, ValidationIssue[]>(resourceId, issues) 
+                    new KeyValuePair<string, ValidationIssue[]>[] {
+                        new KeyValuePair<string, ValidationIssue[]>(resourceId, issues)
                     }
                 ),
                 openAction
@@ -73,7 +71,6 @@
         public ValidationResultsDialog(List<KeyValuePair<string, ValidationIssue[]>> issues)
             : this(issues, null)
         {
-
         }
 
         /// <summary>
@@ -133,12 +130,15 @@
                         case ValidationStatus.Information:
                             lvi.ImageIndex = 0;
                             break;
+
                         case ValidationStatus.Warning:
                             lvi.ImageIndex = 1;
                             break;
+
                         case ValidationStatus.Error:
                             lvi.ImageIndex = 2;
                             break;
+
                         default:
                             lvi.ImageIndex = -1;
                             break;

Modified: trunk/Tools/Maestro/Maestro.Base/Workbench.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Workbench.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/Workbench.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Base.Editor;
+using Maestro.Base.UI;
 using Maestro.Shared.UI;
-using Maestro.Base.UI;
+using System;
 
 namespace Maestro.Base
 {
@@ -35,7 +32,7 @@
     /// </summary>
     public partial class Workbench : WorkbenchBase
     {
-        static Workbench instance;
+        private static Workbench instance;
 
         /// <summary>
         /// Gets the instance.
@@ -118,6 +115,9 @@
         /// Initializes a new instance of the Workbench class
         /// </summary>
         /// <param name="init">The workbench initializer</param>
-        public Workbench(IWorkbenchInitializer init) : base(init) { }
+        public Workbench(IWorkbenchInitializer init)
+            : base(init)
+        {
+        }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/WorkbenchInitializer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/WorkbenchInitializer.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/WorkbenchInitializer.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.Core.WinForms;
+using Maestro.Base.Services;
+using Maestro.Shared.UI;
 using System.Collections.Generic;
-using System.Text;
-using Maestro.Shared.UI;
-using ICSharpCode.Core.WinForms;
 using System.Windows.Forms;
-using Maestro.Base.Services;
 
 namespace Maestro.Base
 {
@@ -36,7 +37,10 @@
         /// Initializes a new instance of the WorkbenchInitializer class
         /// </summary>
         /// <param name="bStartMaximized"></param>
-        public WorkbenchInitializer(bool bStartMaximized) { this.StartMaximized = bStartMaximized; }
+        public WorkbenchInitializer(bool bStartMaximized)
+        {
+            this.StartMaximized = bStartMaximized;
+        }
 
         /// <summary>
         /// Gets whether the workbench will start fully maximized
@@ -115,4 +119,4 @@
             return Properties.Resources.cross_small;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/app.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/app.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly>
+                <assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
 </configuration>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Base/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/packages.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Base/packages.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="TreeViewAdv" version="1.7.0.0" targetFramework="net40" />
+    <package id="TreeViewAdv" version="1.7.0.0" targetFramework="net40" />
 </packages>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/AutoCompletion.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/AutoCompletion.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/AutoCompletion.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -13,57 +14,67 @@
 //  email: office at alphasierrapapa.com
 //  court of jurisdiction: Landesgericht Leoben
 //
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.TextEditor;
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
 using System;
-using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.Common
-{ 
+{
     internal class AutoCompletionListBoxItem
     {
         private string _myText;
         private int _myImageIndex;
-        // properties 
+
+        // properties
         public string Text
         {
             get { return _myText; }
             set { _myText = value; }
         }
+
         public int ImageIndex
         {
             get { return _myImageIndex; }
             set { _myImageIndex = value; }
         }
+
         //constructor
         public AutoCompletionListBoxItem(string text, int index)
         {
             _myText = text;
             _myImageIndex = index;
         }
-        public AutoCompletionListBoxItem(string text) : this(text, -1) { }
-        public AutoCompletionListBoxItem() : this(string.Empty) { }
 
+        public AutoCompletionListBoxItem(string text)
+            : this(text, -1)
+        {
+        }
+
+        public AutoCompletionListBoxItem()
+            : this(string.Empty)
+        {
+        }
+
         private object _tag;
 
         public object Tag
@@ -78,7 +89,7 @@
         }
     }
 
-    // AutoCompletionListBox class 
+    // AutoCompletionListBox class
     //
     // Based on GListBox
     //
@@ -97,15 +108,14 @@
             // Set owner draw mode
             this.DrawMode = DrawMode.OwnerDrawFixed;
             this.IsShown = false;
-            this.Font = new System.Drawing.Font(FontFamily.GenericMonospace, 10.0f); 
+            this.Font = new System.Drawing.Font(FontFamily.GenericMonospace, 10.0f);
             this.DoubleClick += new EventHandler(OnAutoCompleteDoubleClick);
             this.SelectedIndexChanged += new EventHandler(OnAutoCompleteSelectedIndexChanged);
             this.KeyPress += OnKeyPress;
         }
 
-        void OnKeyPress(object sender, KeyPressEventArgs e)
+        private void OnKeyPress(object sender, KeyPressEventArgs e)
         {
-            
         }
 
         internal void HandleEnterKey()
@@ -136,7 +146,7 @@
             }
         }
 
-        void OnAutoCompleteSelectedIndexChanged(object sender, EventArgs e)
+        private void OnAutoCompleteSelectedIndexChanged(object sender, EventArgs e)
         {
             _context.Editor.Focus();
             if (this.Visible && this.SelectedIndex >= 0 && this.Items.Count > 0)
@@ -157,7 +167,7 @@
             }
         }
 
-        void OnAutoCompleteDoubleClick(object sender, EventArgs e)
+        private void OnAutoCompleteDoubleClick(object sender, EventArgs e)
         {
             PutAutoCompleteSuggestion();
             HideBox();
@@ -265,7 +275,7 @@
         }
 
         private AutoCompleteContext _context;
-        
+
         private void SetCompletionItems(Form parent, AutoCompleteContext context, string fileName, bool p1, bool p2)
         {
             _context = context;
@@ -311,4 +321,4 @@
             this.IsShown = false;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ColorComboBox.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ColorComboBox.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ColorComboBox.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Windows.Forms;
 using System.Drawing;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.Common
 {
-
     /// <summary>
     /// A combo box customised for selection of colors
     /// </summary>
@@ -71,7 +73,7 @@
         /// Gets or sets a value indicating whether [allow transparent].
         /// </summary>
         /// <value><c>true</c> if [allow transparent]; otherwise, <c>false</c>.</value>
-        [ System.ComponentModel.Browsable(false), System.ComponentModel.ReadOnly(true) ]
+        [System.ComponentModel.Browsable(false), System.ComponentModel.ReadOnly(true)]
         public bool AllowTransparent
         {
             get { return m_allowTransparent; }
@@ -82,12 +84,12 @@
         /// Gets or sets a value indicating whether [transparent selected].
         /// </summary>
         /// <value><c>true</c> if [transparent selected]; otherwise, <c>false</c>.</value>
-        [ System.ComponentModel.Browsable(false), System.ComponentModel.ReadOnly(true) ]
+        [System.ComponentModel.Browsable(false), System.ComponentModel.ReadOnly(true)]
         public bool TransparentSelected
         {
             get { return this.SelectedItem == SpecialCell.Transparent; }
-            set 
-            { 
+            set
+            {
                 if (value)
                     this.SelectedItem = SpecialCell.Transparent;
                 else
@@ -99,10 +101,10 @@
         /// Gets or sets the color of the current.
         /// </summary>
         /// <value>The color of the current.</value>
-        [ System.ComponentModel.Browsable(false), System.ComponentModel.ReadOnly(true) ]
+        [System.ComponentModel.Browsable(false), System.ComponentModel.ReadOnly(true)]
         public Color CurrentColor
         {
-            get 
+            get
             {
                 if (this.SelectedItem == null)
                     return m_currentColor.Color;
@@ -123,7 +125,6 @@
                     this.SelectedItem = m_currentColor;
                 }
             }
-    
         }
 
         /// <summary>
@@ -146,11 +147,9 @@
                     base.OnMeasureItem(e);
             }
             else
-                base.OnMeasureItem (e);
+                base.OnMeasureItem(e);
         }
 
-
-
         /// <summary>
         /// Raises the <see cref="E:System.Windows.Forms.ComboBox.SelectedIndexChanged"/> event.
         /// </summary>
@@ -176,14 +175,13 @@
                 }
             }
             else
-                m_currentColor.Color = this.CurrentColor; 
-            base.OnSelectedIndexChanged (e);
+                m_currentColor.Color = this.CurrentColor;
+            base.OnSelectedIndexChanged(e);
         }
 
-
         private const int MARGIN = 2;
 
-        private readonly Color[] KnownColors = 
+        private readonly Color[] KnownColors =
         {
             Color.Black,
             Color.White,
@@ -210,10 +208,10 @@
         /// <returns>
         /// A <see cref="T:System.Windows.Forms.ComboBox.ObjectCollection"/> representing the items in the <see cref="T:System.Windows.Forms.ComboBox"/>.
         /// </returns>
-        [ System.ComponentModel.Browsable(false), System.ComponentModel.ReadOnly(true) ]
+        [System.ComponentModel.Browsable(false), System.ComponentModel.ReadOnly(true)]
         public new ComboBox.ObjectCollection Items
         {
-            get 
+            get
             {
                 return base.Items;
             }
@@ -230,6 +228,7 @@
 
             private CellTypes m_cellType;
             private Color m_color;
+
             public SpecialCell(CellTypes celltype)
             {
                 m_cellType = celltype;
@@ -255,12 +254,11 @@
                 else if (m_cellType == CellTypes.Transparent)
                     return Strings.TransparentName;
                 else
-                    return base.ToString ();
+                    return base.ToString();
             }
 
             public static readonly SpecialCell MoreColors = new SpecialCell(CellTypes.MoreColors);
             public static readonly SpecialCell Transparent = new SpecialCell(CellTypes.Transparent);
-
         }
 
         private bool ColorComboRender(DrawItemEventArgs e, object value)
@@ -288,7 +286,6 @@
                 color = Color.FromArgb(median, median, median);
             }
 
-
             e.DrawBackground();
 
             Rectangle r = new Rectangle(e.Bounds.X + MARGIN, e.Bounds.Y + MARGIN, e.Bounds.Width - MARGIN * 2, e.Bounds.Height - MARGIN * 2);
@@ -298,7 +295,7 @@
 
             if ((e.State & DrawItemState.Selected) == DrawItemState.Selected)
                 e.DrawFocusRectangle();
-            
+
             return true;
         }
 
@@ -308,7 +305,7 @@
         /// <value>The color picker.</value>
         public ColorDialog ColorPicker
         {
-            get 
+            get
             {
                 if (m_colorPicker == null)
                 {
@@ -317,7 +314,7 @@
 
                     m_colorPicker = m_sharedColorPicker;
                 }
-                return m_colorPicker; 
+                return m_colorPicker;
             }
             set { m_colorPicker = value; }
         }

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ColorComboWithTransparency.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ColorComboWithTransparency.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ColorComboWithTransparency.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.Common
@@ -70,7 +69,7 @@
 
                     if (CurrentColorChanged != null)
                         CurrentColorChanged(this, null);
-                    
+
                     colorCombo.Refresh();
                 }
                 finally
@@ -100,4 +99,4 @@
                 CurrentColorChanged(this, null);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ColorPickerDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ColorPickerDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ColorPickerDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.Common
@@ -59,4 +58,4 @@
             this.DialogResult = DialogResult.OK;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/CoordinateSystemPicker.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/CoordinateSystemPicker.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/CoordinateSystemPicker.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
 
 namespace Maestro.Editors.Common
 {
@@ -51,7 +49,8 @@
         /// Initializes a new instance of the <see cref="CoordinateSystemPicker"/> class.
         /// </summary>
         /// <param name="cat">The cat.</param>
-        public CoordinateSystemPicker(ICoordinateSystemCatalog cat) : this()
+        public CoordinateSystemPicker(ICoordinateSystemCatalog cat)
+            : this()
         {
             if (cat == null)
             {
@@ -206,7 +205,6 @@
             }
             catch
             {
-                
             }
             UpdateOKButton();
         }
@@ -302,7 +300,6 @@
                 return;
 
             UpdateOKButton();
-
         }
 
         private void UpdateAfterRadioButtons()
@@ -313,7 +310,6 @@
             SelectByEPSGCodeGroup.Enabled = SelectByEPSGCode.Checked;
 
             UpdateOKButton();
-
         }
 
         private void UpdateOKButton()
@@ -392,4 +388,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/CustomCombo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/CustomCombo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/CustomCombo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,128 +1,125 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections;
-using System.ComponentModel;
 using System.Drawing;
-using System.Data;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.Common
 {
-	/// <summary>
-	/// A combobox that is able to display custom items
-	/// </summary>
+    /// <summary>
+    /// A combobox that is able to display custom items
+    /// </summary>
     [Serializable]
-    public class CustomCombo : System.Windows.Forms.ComboBox 
-	{
-
+    public class CustomCombo : System.Windows.Forms.ComboBox
+    {
         /// <summary>
         /// Initializes a new instance of the <see cref="CustomCombo"/> class.
         /// </summary>
-		public CustomCombo()
-			: base()
-		{
-			if (!this.DesignMode)
-			{
-				base.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable;
-				base.DropDownStyle = ComboBoxStyle.DropDownList;
-			}
-		}
+        public CustomCombo()
+            : base()
+        {
+            if (!this.DesignMode)
+            {
+                base.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable;
+                base.DropDownStyle = ComboBoxStyle.DropDownList;
+            }
+        }
 
         /// <summary>
         /// Raises the <see cref="E:System.Windows.Forms.ComboBox.DrawItem"/> event.
         /// </summary>
         /// <param name="e">A <see cref="T:System.Windows.Forms.DrawItemEventArgs"/> that contains the event data.</param>
-		protected override void OnDrawItem(DrawItemEventArgs e)
-		{
-			bool handled = false;
+        protected override void OnDrawItem(DrawItemEventArgs e)
+        {
+            bool handled = false;
 
-			if (e.Index < 0)
-				return;
+            if (e.Index < 0)
+                return;
 
-			if (m_render != null)
-				handled = m_render(e, this.Items[e.Index]);
+            if (m_render != null)
+                handled = m_render(e, this.Items[e.Index]);
 
-			if (!handled && this.Items[e.Index].GetType().GetInterface(typeof(CustomComboItem).FullName, false) != null)
-				((CustomComboItem)this.Items[e.Index]).DrawItem(e);
-			else if (!handled)
-			{
-				//Standard handler
-				e.DrawBackground();
-				StringFormat format = new StringFormat();
-				format.Trimming = StringTrimming.EllipsisCharacter;
-				format.FormatFlags = StringFormatFlags.NoWrap | StringFormatFlags.FitBlackBox;
+            if (!handled && this.Items[e.Index].GetType().GetInterface(typeof(CustomComboItem).FullName, false) != null)
+                ((CustomComboItem)this.Items[e.Index]).DrawItem(e);
+            else if (!handled)
+            {
+                //Standard handler
+                e.DrawBackground();
+                StringFormat format = new StringFormat();
+                format.Trimming = StringTrimming.EllipsisCharacter;
+                format.FormatFlags = StringFormatFlags.NoWrap | StringFormatFlags.FitBlackBox;
 
-				using(Brush b = new SolidBrush(this.ForeColor))
-					e.Graphics.DrawString(this.Items[e.Index].ToString(), this.Font, b, e.Bounds, format);
+                using (Brush b = new SolidBrush(this.ForeColor))
+                    e.Graphics.DrawString(this.Items[e.Index].ToString(), this.Font, b, e.Bounds, format);
 
-				base.OnDrawItem (e);
+                base.OnDrawItem(e);
 
-				if ((e.State & DrawItemState.Selected) == DrawItemState.Selected)
-					e.DrawFocusRectangle();
-			}
-		}
+                if ((e.State & DrawItemState.Selected) == DrawItemState.Selected)
+                    e.DrawFocusRectangle();
+            }
+        }
 
-		/// <summary>
-		/// Property is overridden to prevent the designer from modifying the value
-		/// </summary>
-		[ System.ComponentModel.Browsable(false), System.ComponentModel.ReadOnly(true) ]
-		public new DrawMode DrawMode
-		{
-			get { return base.DrawMode; }
-			set { base.DrawMode = value; }
-		}
+        /// <summary>
+        /// Property is overridden to prevent the designer from modifying the value
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.ReadOnly(true)]
+        public new DrawMode DrawMode
+        {
+            get { return base.DrawMode; }
+            set { base.DrawMode = value; }
+        }
 
-		/// <summary>
-		/// Property is overridden to prevent the designer for modifying the value
-		/// </summary>
-		[ System.ComponentModel.Browsable(false), System.ComponentModel.ReadOnly(true) ]
-		public new ComboBoxStyle DropDownStyle
-		{
-			get { return base.DropDownStyle; }
-			set { base.DropDownStyle = value; }
-		}
+        /// <summary>
+        /// Property is overridden to prevent the designer for modifying the value
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.ReadOnly(true)]
+        public new ComboBoxStyle DropDownStyle
+        {
+            get { return base.DropDownStyle; }
+            set { base.DropDownStyle = value; }
+        }
 
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+            }
+            base.Dispose(disposing);
+        }
 
-		/// <summary> 
-		/// Clean up any resources being used.
-		/// </summary>
-		protected override void Dispose( bool disposing )
-		{
-			if( disposing )
-			{
-			}
-			base.Dispose( disposing );
-		}
+        /// <summary>
+        /// Delegate used for handling custom rendering. Return true if handled, false otherwise
+        /// </summary>
+        public delegate bool RenderCustomItem(DrawItemEventArgs e, object value);
 
+        /// <summary>
+        /// Holder for custom render
+        /// </summary>
+        private RenderCustomItem m_render = null;
 
-		/// <summary>
-		/// Delegate used for handling custom rendering. Return true if handled, false otherwise
-		/// </summary>
-		public delegate bool RenderCustomItem(DrawItemEventArgs e, object value);
-
-		/// <summary>
-		/// Holder for custom render
-		/// </summary>
-		private RenderCustomItem m_render = null;
-
         /// <summary>
         /// Sets the custom render callback item
         /// </summary>
@@ -132,15 +129,15 @@
             m_render = render;
         }
 
-		/// <summary>
-		/// Interface for items in custom combo
-		/// </summary>
-		public interface CustomComboItem
-		{
-			/// <summary>
-			/// Method that gets called when an object should be rendered
-			/// </summary>
-			void DrawItem(DrawItemEventArgs e);
-		}
-	}
-}
+        /// <summary>
+        /// Interface for items in custom combo
+        /// </summary>
+        public interface CustomComboItem
+        {
+            /// <summary>
+            /// Method that gets called when an object should be rendered
+            /// </summary>
+            void DrawItem(DrawItemEventArgs e);
+        }
+    }
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/EditorBindableCollapsiblePanel.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/EditorBindableCollapsiblePanel.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/EditorBindableCollapsiblePanel.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using Maestro.Shared.UI;
 using System.ComponentModel;
 
 namespace Maestro.Editors.Common
 {
     /// <summary>
-    /// An extension of <see cref="CollapsiblePanel"/> with a default implementation of the 
+    /// An extension of <see cref="CollapsiblePanel"/> with a default implementation of the
     /// <see cref="IEditorBindable"/> interface
     /// </summary>
     [ToolboxItem(false)]
@@ -74,7 +75,10 @@
             }
         }
 
-        internal void RaiseResourceChanged() { OnResourceChanged(); }
+        internal void RaiseResourceChanged()
+        {
+            OnResourceChanged();
+        }
 
         /// <summary>
         /// Raises the <see cref="ResourceChanged"/> event. If overridden in the derived class, be sure
@@ -95,12 +99,11 @@
         private void InitializeComponent()
         {
             this.SuspendLayout();
-            // 
+            //
             // EditorBindableCollapsiblePanel
-            // 
+            //
             this.Name = "EditorBindableCollapsiblePanel"; //NOXLATE
             this.ResumeLayout(false);
-
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/EditorWindow.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/EditorWindow.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/EditorWindow.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Preview;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
@@ -37,7 +35,7 @@
     /// </summary>
     public partial class EditorWindow : Form
     {
-        class DefaultResourceEditorService : ResourceEditorServiceBase
+        private class DefaultResourceEditorService : ResourceEditorServiceBase
         {
             public DefaultResourceEditorService(string resourceID, IServerConnection conn)
                 : base(resourceID, conn)
@@ -50,11 +48,10 @@
             /// <param name="resourceId"></param>
             public override void OpenResource(string resourceId)
             {
-            
             }
 
             /// <summary>
-            /// Called when an editor requires opening a url. 
+            /// Called when an editor requires opening a url.
             /// </summary>
             /// <param name="url"></param>
             public override void OpenUrl(string url)
@@ -68,7 +65,6 @@
             /// <param name="folderId"></param>
             public override void RequestRefresh(string folderId)
             {
-            
             }
 
             /// <summary>
@@ -76,7 +72,6 @@
             /// </summary>
             public override void RequestRefresh()
             {
-            
             }
 
             /// <summary>
@@ -136,9 +131,9 @@
             _svc.MarkDirty();
         }
 
-        const string DIRTY_PREFIX = "* ";
+        private const string DIRTY_PREFIX = "* ";
 
-        void OnDirtyStateChanged(object sender, EventArgs e)
+        private void OnDirtyStateChanged(object sender, EventArgs e)
         {
             if (_svc.IsDirty)
             {
@@ -194,4 +189,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/Expression/FdoExpressionCompletionDataProvider.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/Expression/FdoExpressionCompletionDataProvider.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/Expression/FdoExpressionCompletionDataProvider.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,22 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.TextEditor;
 using ICSharpCode.TextEditor.Document;
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
@@ -127,7 +130,7 @@
         /// <summary>
         /// Gets the line of text up to the cursor position.
         /// </summary>
-        string GetLineText(TextArea textArea)
+        private string GetLineText(TextArea textArea)
         {
             LineSegment lineSegment = textArea.Document.GetLineSegmentForOffset(textArea.Caret.Offset);
             return textArea.Document.GetText(lineSegment);
@@ -138,7 +141,7 @@
             return GenerateCompletionData((GetLineText(textArea) + charTyped).Trim());
         }
 
-        class FdoCompletionData : DefaultCompletionData
+        private class FdoCompletionData : DefaultCompletionData
         {
             private string _insertText;
             private string _appendText;
@@ -222,7 +225,7 @@
             return items.ToArray();
         }
 
-        class Descriptor
+        private class Descriptor
         {
             public string Name;
             public string Description;
@@ -431,4 +434,4 @@
             return res;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/Expression/LookupExpressionBuilder.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/Expression/LookupExpressionBuilder.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/Expression/LookupExpressionBuilder.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,27 @@
 #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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Globalization;
-using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
@@ -31,9 +29,10 @@
 {
     internal partial class LookupExpressionBuilder : Form
     {
-        class LookupItem
+        private class LookupItem
         {
             public string Key { get; set; }
+
             public string Value { get; set; }
         }
 
@@ -79,4 +78,4 @@
             this.DialogResult = System.Windows.Forms.DialogResult.Cancel;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/Expression/RangeExpressionBuilder.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/Expression/RangeExpressionBuilder.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/Expression/RangeExpressionBuilder.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +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
-// 
-#endregion
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.Globalization;
-using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
@@ -31,10 +30,12 @@
 {
     internal partial class RangeExpressionBuilder : Form
     {
-        class LookupItem
+        private class LookupItem
         {
             public double Min { get; set; }
+
             public double Max { get; set; }
+
             public string Value { get; set; }
         }
 
@@ -80,4 +81,4 @@
             this.DialogResult = System.Windows.Forms.DialogResult.Cancel;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ExpressionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ExpressionEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ExpressionEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,39 +1,37 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common.Expression;
+using Maestro.Editors.LayerDefinition.Vector.Thematics;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.ObjectModels.Capabilities;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.ObjectModels.Capabilities;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using Maestro.Editors.Common.Expression;
-using ICSharpCode.TextEditor.Gui.CompletionWindow;
-using Maestro.Editors.LayerDefinition.Vector.Thematics;
 
 namespace Maestro.Editors.Common
 {
@@ -47,7 +45,7 @@
         private string m_featureSource = null;
         private IFdoProviderCapabilities _caps;
         private ITextEditor _editor;
-        
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ExpressionEditor"/> class.
         /// </summary>
@@ -255,7 +253,7 @@
             this.Close();
         }
 
-        bool OnEditorDialogKeyPress(Keys keyData)
+        private bool OnEditorDialogKeyPress(Keys keyData)
         {
             if (_editor.ProcessKeyPress(keyData))
                 return true;
@@ -266,7 +264,7 @@
             return false;
         }
 
-        bool OnEditorKeyPress(char ch)
+        private bool OnEditorKeyPress(char ch)
         {
             if (Char.IsLetter(ch))
             {
@@ -288,7 +286,7 @@
                 _contextualBuffer.Remove(_contextualBuffer.Length - 1, 1);
                 System.Diagnostics.Debug.WriteLine("Contextual buffer: " + _contextualBuffer);
                 //if (_contextualBuffer.Length == 0)
-                    //this.HideBox();
+                //this.HideBox();
             }
         }
 
@@ -306,7 +304,6 @@
 
         private void ColumnName_Click(object sender, EventArgs e)
         {
-
         }
 
         private void ColumnName_SelectedIndexChanged(object sender, EventArgs e)
@@ -327,7 +324,7 @@
                 ColumnValue.Tag = null;
                 try
                 {
-                    using (var rdr = _edSvc.CurrentConnection.FeatureService.AggregateQueryFeatureSource(m_featureSource, _cls.QualifiedName, filter, new System.Collections.Specialized.NameValueCollection() { 
+                    using (var rdr = _edSvc.CurrentConnection.FeatureService.AggregateQueryFeatureSource(m_featureSource, _cls.QualifiedName, filter, new System.Collections.Specialized.NameValueCollection() {
                             { "UNIQ_VALS", expr } //NOXLATE
                         }))
                     {
@@ -445,7 +442,7 @@
                             InsertText(ColumnValue.Text);
                     }
                 }
-                else 
+                else
                 {
                     InsertText(ColumnValue.Text);
                 }
@@ -480,7 +477,7 @@
             using (var picker = new ColorDialog())
             {
                 if (picker.ShowDialog() == System.Windows.Forms.DialogResult.OK)
-                { 
+                {
                     var c = picker.Color;
                     this.InsertText(string.Format("ARGB({0}, {1}, {2}, {3})", c.A, c.R, c.G, c.B));
                 }

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/FindReplaceDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/FindReplaceDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/FindReplaceDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.Common
@@ -76,4 +74,4 @@
             btnReplace.Enabled = (!string.IsNullOrEmpty(txtFind.Text)) && (txtFind.Text != txtReplace.Text);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/GenericInputDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/GenericInputDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/GenericInputDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.Common
@@ -81,4 +79,4 @@
             return null;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/GenericItemSelectionDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/GenericItemSelectionDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/GenericItemSelectionDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.Common
@@ -182,4 +181,4 @@
                 this.DialogResult = DialogResult.OK;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/IExpressionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/IExpressionEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/IExpressionEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels.Capabilities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Maestro.Editors.Common
 {
@@ -78,4 +76,4 @@
                 return new ExpressionEditor();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ITextEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ITextEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ITextEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -13,30 +14,28 @@
 //  email: office at alphasierrapapa.com
 //  court of jurisdiction: Landesgericht Leoben
 //
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.TextEditor;
 using ICSharpCode.TextEditor.Document;
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
-using System;
-using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
-using System.Text;
 
 namespace Maestro.Editors.Common
 {
@@ -152,6 +151,6 @@
         /// Sets the parent control for this editor
         /// </summary>
         /// <param name="ctrl"></param>
-        void SetParent(System.Windows.Forms.Control ctrl); 
+        void SetParent(System.Windows.Forms.Control ctrl);
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ImageStylePicker.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ImageStylePicker.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ImageStylePicker.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,174 +1,176 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
-using System;
+//
+
+#endregion Disclaimer / License
+
+using System.Drawing;
 using System.Windows.Forms;
-using System.Drawing;
 
 namespace Maestro.Editors.Common
 {
     /// <summary>
     /// A custom combobox to choose image styles
     /// </summary>
-	public class ImageStylePicker
-		: CustomCombo
-	{
-		private int m_itemHeight = 20;
-		private int m_textWidth = 40;
+    public class ImageStylePicker
+        : CustomCombo
+    {
+        private int m_itemHeight = 20;
+        private int m_textWidth = 40;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageStylePicker"/> class.
         /// </summary>
-		public ImageStylePicker()
-			: base()
-		{
-			if (!this.DesignMode)
-			{
-				base.SetCustomRender(new RenderCustomItem(ImageComboRender));
+        public ImageStylePicker()
+            : base()
+        {
+            if (!this.DesignMode)
+            {
+                base.SetCustomRender(new RenderCustomItem(ImageComboRender));
                 base.ValueMember = "Name"; //NOXLATE
                 base.DisplayMember = "Name"; //NOXLATE
-			}
-		}
+            }
+        }
 
         /// <summary>
         /// Gets or sets the width of the text.
         /// </summary>
         /// <value>The width of the text.</value>
-		public int TextWidth
-		{
-			get { return m_textWidth; }
-			set { m_textWidth = value; }
-		}
+        public int TextWidth
+        {
+            get { return m_textWidth; }
+            set { m_textWidth = value; }
+        }
 
         /// <summary>
         /// Raises the <see cref="E:System.Windows.Forms.ComboBox.MeasureItem"/> event.
         /// </summary>
         /// <param name="e">The <see cref="T:System.Windows.Forms.MeasureItemEventArgs"/> that was raised.</param>
-		protected override void OnMeasureItem(MeasureItemEventArgs e)
-		{
-			if (e.Index < 0)
-				return;
+        protected override void OnMeasureItem(MeasureItemEventArgs e)
+        {
+            if (e.Index < 0)
+                return;
 
-			Image bmp = this.Items[e.Index] as Image;
+            Image bmp = this.Items[e.Index] as Image;
 
-			if (bmp == null && this.Items[e.Index] as NamedImage != null)
-				bmp = (this.Items[e.Index] as NamedImage).Image;
+            if (bmp == null && this.Items[e.Index] as NamedImage != null)
+                bmp = (this.Items[e.Index] as NamedImage).Image;
 
-			if (bmp != null)
-				e.ItemHeight = m_itemHeight + MARGIN * 3;
-			else
-				base.OnMeasureItem(e);
-		}
+            if (bmp != null)
+                e.ItemHeight = m_itemHeight + MARGIN * 3;
+            else
+                base.OnMeasureItem(e);
+        }
 
-		private const int MARGIN = 2;
+        private const int MARGIN = 2;
 
-		private bool ImageComboRender(DrawItemEventArgs e, object value)
-		{
-			Image bmp;
-			string text;
+        private bool ImageComboRender(DrawItemEventArgs e, object value)
+        {
+            Image bmp;
+            string text;
 
-			if (value as NamedImage != null)
-			{
-				bmp = (value as NamedImage).Image;
-				text = (value as NamedImage).Name;
-			}
-			else if (value as Image != null)
-			{
-				bmp = value as Image;
-				text = null;
-			}
-			else 
-				return false;
+            if (value as NamedImage != null)
+            {
+                bmp = (value as NamedImage).Image;
+                text = (value as NamedImage).Name;
+            }
+            else if (value as Image != null)
+            {
+                bmp = value as Image;
+                text = null;
+            }
+            else
+                return false;
 
-			e.DrawBackground();
+            e.DrawBackground();
 
-			Color brushcolor = this.Enabled ? this.ForeColor : System.Drawing.SystemColors.GrayText; 
-			int imageWidth = e.Bounds.Width - m_textWidth - MARGIN * 2;
+            Color brushcolor = this.Enabled ? this.ForeColor : System.Drawing.SystemColors.GrayText;
+            int imageWidth = e.Bounds.Width - m_textWidth - MARGIN * 2;
 
             int startX = e.Bounds.X + MARGIN;
             int startY = e.Bounds.Y + MARGIN;
 
-			//TODO: Apply B/W + dim filter here
+            //TODO: Apply B/W + dim filter here
             Rectangle r = new Rectangle(startX + 1, startY + 1, imageWidth - 1, m_itemHeight - 1);
             e.Graphics.DrawImageUnscaledAndClipped(bmp, r);
 
             r = new Rectangle(startX, startY, imageWidth, m_itemHeight);
-			using(Pen p = new Pen(brushcolor))
-				e.Graphics.DrawRectangle(p, r);
+            using (Pen p = new Pen(brushcolor))
+                e.Graphics.DrawRectangle(p, r);
 
-			if (text != null && text.Length > 0)
-			{
-				StringFormat format = new StringFormat();
-				format.Trimming = StringTrimming.EllipsisCharacter;
-				format.FormatFlags = StringFormatFlags.NoWrap | StringFormatFlags.FitBlackBox;
+            if (text != null && text.Length > 0)
+            {
+                StringFormat format = new StringFormat();
+                format.Trimming = StringTrimming.EllipsisCharacter;
+                format.FormatFlags = StringFormatFlags.NoWrap | StringFormatFlags.FitBlackBox;
 
-				int textHeight = (int)e.Graphics.MeasureString(text, this.Font, m_textWidth, format).Height;
-				int centerY = ((e.Bounds.Height - textHeight) / 2) + e.Bounds.Y;
+                int textHeight = (int)e.Graphics.MeasureString(text, this.Font, m_textWidth, format).Height;
+                int centerY = ((e.Bounds.Height - textHeight) / 2) + e.Bounds.Y;
 
-				r = new Rectangle(e.Bounds.X + MARGIN * 2 + imageWidth, centerY, m_textWidth, m_itemHeight);
-				using(Brush b = new SolidBrush(brushcolor))
-					e.Graphics.DrawString(text, this.Font, b, r, format);
+                r = new Rectangle(e.Bounds.X + MARGIN * 2 + imageWidth, centerY, m_textWidth, m_itemHeight);
+                using (Brush b = new SolidBrush(brushcolor))
+                    e.Graphics.DrawString(text, this.Font, b, r, format);
 
-				if ((e.State & DrawItemState.Selected) == DrawItemState.Selected)
-					e.DrawFocusRectangle();
-			}
-			return true;
-		}
+                if ((e.State & DrawItemState.Selected) == DrawItemState.Selected)
+                    e.DrawFocusRectangle();
+            }
+            return true;
+        }
 
         /// <summary>
         /// A named image instance
         /// </summary>
-		public class NamedImage
-		{
+        public class NamedImage
+        {
             /// <summary>
             /// Initializes a new instance of the <see cref="NamedImage"/> class.
             /// </summary>
             /// <param name="name">The name.</param>
             /// <param name="image">The image.</param>
-			public NamedImage(string name, Image image)
-			{
-				m_name = name;
-				m_image = image;
-			}
+            public NamedImage(string name, Image image)
+            {
+                m_name = name;
+                m_image = image;
+            }
 
-			private Image m_image;
-			private string m_name;
+            private Image m_image;
+            private string m_name;
 
             /// <summary>
             /// Gets or sets the image.
             /// </summary>
             /// <value>The image.</value>
-			public Image Image
-			{
-				get { return m_image; }
-				set { m_image = value; }
-			}
+            public Image Image
+            {
+                get { return m_image; }
+                set { m_image = value; }
+            }
 
             /// <summary>
             /// Gets or sets the name.
             /// </summary>
             /// <value>The name.</value>
-			public string Name 
-			{
-				get { return m_name; }
-				set { m_name = value; }
-			}
+            public string Name
+            {
+                get { return m_name; }
+                set { m_name = value; }
+            }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/MonoCompatibleExpressionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/MonoCompatibleExpressionEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/MonoCompatibleExpressionEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,50 +1,49 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common.Expression;
+using Maestro.Editors.LayerDefinition.Vector.Thematics;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.ObjectModels.Capabilities;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.ObjectModels.Capabilities;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using Maestro.Editors.LayerDefinition.Vector.Thematics;
-using Maestro.Editors.Common.Expression;
 
 namespace Maestro.Editors.Common
 {
     /*
      * Intellisense overview:
-     * 
+     *
      * The intellisense of this expression editor consists of the following parts:
      *  - An ImageListBox which is filled with auto-complete suggestions
      *  - A System.Windows.Forms.ToolTip which is shown when an auto-complete choice is highlighted (but not selected)
-     * 
+     *
      * In order to invoke intellisense, we listen for the KeyUp and KeyDown events
      * on the textbox to determine what actions to take. Some actions include:
-     * 
+     *
      * Key Up:
      *  - Comma: Show auto-complete with all suggestions
      *  - Quotes (Single or Double): Insert an extra quote of that type
@@ -52,17 +51,17 @@
      *  - Backspace: Invoke auto-complete with suggestions if there is a context buffer, otherwise hide auto-complete.
      *  - Alt + Right: Invoke auto-complete with all suggestions
      *  - Alphanumeric (no modifiers): Invoke auto-complete with suggestions
-     * 
+     *
      * Key Down:
      *  - Escape: Hide auto-complete
      *  - Enter: Hide auto-complete
-     * 
+     *
      * As part of the loading process, a full list of auto-complete items (functions/properties) is constructed (sorted by name)
      * Everytime intellisense is invoked, this list is queried for possible suggestions.
-     * 
+     *
      * In order to determine what items to suggest, the editor builds a context buffer from the current position of the caret
      * in the textbox. The context buffer algorithm is as follows:
-     * 
+     *
      *  1 - Start from caret position
      *  2 - Can we move back one char?
      *    2.1 - Get this char.
@@ -274,25 +273,25 @@
             {
                 ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>()
                 {
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "aValue", //NOXLATE
                         Description = Strings.Func_ARGB_AValueDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.Int32
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "rValue", //NOXLATE
                         Description = Strings.Func_ARGB_RValueDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.Int32
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "gValue", //NOXLATE
                         Description = Strings.Func_ARGB_GValueDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.Int32
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "bValue", //NOXLATE
                         Description = Strings.Func_ARGB_BValueDescription,
@@ -308,7 +307,7 @@
             {
                 ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>()
                 {
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "strValue", //NOXLATE
                         Description = Strings.Func_DECAP_StringValueDescription,
@@ -340,19 +339,19 @@
             {
                 ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>()
                 {
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "condition", //NOXLATE
                         Description = Strings.Func_IF_ConditionDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "trueValue", //NOXLATE
                         Description = Strings.Func_IF_TrueValueDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "falseValue", //NOXLATE
                         Description = Strings.Func_IF_FalseValueDescription,
@@ -376,25 +375,25 @@
             {
                 ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>()
                 {
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "expression", //NOXLATE
                         Description = Strings.Func_LOOKUP_ExpressionDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "defaultValue", //NOXLATE
                         Description = Strings.Func_LOOKUP_DefaultValueDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "index", //NOXLATE
                         Description = Strings.Func_LOOKUP_IndexDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "value", //NOXLATE
                         Description = Strings.Func_LOOKUP_ValueDescription,
@@ -418,31 +417,31 @@
             {
                 ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>()
                 {
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "expression", //NOXLATE
                         Description = Strings.Func_RANGE_ExpressionDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "rangeMin", //NOXLATE
                         Description = Strings.Func_RANGE_MinDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "rangeMax", //NOXLATE
                         Description = Strings.Func_RANGE_MaxDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "defaultValue", //NOXLATE
                         Description = Strings.Func_RANGE_DefaultValueDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "value", //NOXLATE
                         Description = Strings.Func_RANGE_ValueDescription,
@@ -466,7 +465,7 @@
             {
                 ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>()
                 {
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "strValue", //NOXLATE
                         Description = Strings.Func_URLENCODE_StringValueDescription,
@@ -522,7 +521,7 @@
         private SortedList<string, List<AutoCompleteItem>> _autoCompleteItems = new SortedList<string, List<AutoCompleteItem>>();
         private ImageListBox _autoBox;
 
-        enum AutoCompleteItemType : int
+        private enum AutoCompleteItemType : int
         {
             Property = 0,
             Function = 1,
@@ -531,7 +530,7 @@
         /// <summary>
         /// Base auto-complete item
         /// </summary>
-        abstract class AutoCompleteItem
+        private abstract class AutoCompleteItem
         {
             public abstract AutoCompleteItemType Type { get; }
 
@@ -545,7 +544,7 @@
         /// <summary>
         /// Property auto-complete item
         /// </summary>
-        class PropertyItem : AutoCompleteItem
+        private class PropertyItem : AutoCompleteItem
         {
             private PropertyDefinition _propDef;
 
@@ -587,7 +586,7 @@
         /// <summary>
         /// Function auto-complete item
         /// </summary>
-        class FunctionItem : AutoCompleteItem
+        private class FunctionItem : AutoCompleteItem
         {
             private IFdoFunctionDefintion _func;
             private IFdoFunctionDefintionSignature _sig;
@@ -627,7 +626,7 @@
                         string argDesc = FdoExpressionCompletionDataProvider.DescribeSignature(_sig);
                         _ttText = string.Format(Strings.ExprEditorFunctionDesc, _insertExpr, _func.Description, argDesc, _sig.ReturnType, Environment.NewLine);
                     }
-                        //_ttText = string.Format(Strings.FunctionTooltip, GetReturnTypeString(), _func.Name, GetArgumentString(), _func.Description);
+                    //_ttText = string.Format(Strings.FunctionTooltip, GetReturnTypeString(), _func.Name, GetArgumentString(), _func.Description);
 
                     return _ttText;
                 }
@@ -679,12 +678,12 @@
             ExpressionText.Controls.Add(_autoBox);
         }
 
-        void OnAutoCompleteKeyDown(object sender, KeyEventArgs e)
+        private void OnAutoCompleteKeyDown(object sender, KeyEventArgs e)
         {
             ExpressionText.Focus();
         }
 
-        void OnAutoCompleteKeyUp(object sender, KeyEventArgs e)
+        private void OnAutoCompleteKeyUp(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Return || e.KeyCode == Keys.Enter)
             {
@@ -694,7 +693,7 @@
             }
         }
 
-        void OnAutoCompleteSelectedIndexChanged(object sender, EventArgs e)
+        private void OnAutoCompleteSelectedIndexChanged(object sender, EventArgs e)
         {
             ExpressionText.Focus();
             if (_autoBox.Visible && _autoBox.SelectedIndex >= 0 && _autoBox.Items.Count > 0)
@@ -708,7 +707,7 @@
             }
         }
 
-        void OnAutoCompleteDoubleClick(object sender, EventArgs e)
+        private void OnAutoCompleteDoubleClick(object sender, EventArgs e)
         {
             PutAutoCompleteSuggestion();
             _autoBox.Hide();
@@ -902,7 +901,6 @@
                     InsertText("\"");
                 else                            // '
                     InsertText("'");
-
             }
             else if (code == Keys.D9 && e.Modifiers == Keys.Shift) // (
             {
@@ -1020,7 +1018,6 @@
 
         private void ColumnName_Click(object sender, EventArgs e)
         {
-
         }
 
         private void ColumnName_SelectedIndexChanged(object sender, EventArgs e)
@@ -1041,7 +1038,7 @@
                 ColumnValue.Tag = null;
                 try
                 {
-                    using (var rdr = _edSvc.CurrentConnection.FeatureService.AggregateQueryFeatureSource(m_featureSource, _cls.QualifiedName, filter, new System.Collections.Specialized.NameValueCollection() { 
+                    using (var rdr = _edSvc.CurrentConnection.FeatureService.AggregateQueryFeatureSource(m_featureSource, _cls.QualifiedName, filter, new System.Collections.Specialized.NameValueCollection() {
                             { "UNIQ_VALS", expr }
                         }))
                     {
@@ -1242,31 +1239,42 @@
         }
     }
 
-    // ImageListBoxItem class 
+    // ImageListBoxItem class
     internal class ImageListBoxItem
     {
         private string _myText;
         private int _myImageIndex;
-        // properties 
+
+        // properties
         public string Text
         {
             get { return _myText; }
             set { _myText = value; }
         }
+
         public int ImageIndex
         {
             get { return _myImageIndex; }
             set { _myImageIndex = value; }
         }
+
         //constructor
         public ImageListBoxItem(string text, int index)
         {
             _myText = text;
             _myImageIndex = index;
         }
-        public ImageListBoxItem(string text) : this(text, -1) { }
-        public ImageListBoxItem() : this("") { }
 
+        public ImageListBoxItem(string text)
+            : this(text, -1)
+        {
+        }
+
+        public ImageListBoxItem()
+            : this("")
+        {
+        }
+
         private object _tag;
 
         public object Tag
@@ -1281,7 +1289,7 @@
         }
     }//End of ImageListBoxItem class
 
-    // ImageListBox class 
+    // ImageListBox class
     //
     // Based on GListBox
     //
@@ -1290,16 +1298,19 @@
     internal class ImageListBox : ListBox
     {
         private ImageList _myImageList;
+
         public ImageList ImageList
         {
             get { return _myImageList; }
             set { _myImageList = value; }
         }
+
         public ImageListBox()
         {
             // Set owner draw mode
             this.DrawMode = DrawMode.OwnerDrawFixed;
         }
+
         protected override void OnDrawItem(System.Windows.Forms.DrawItemEventArgs e)
         {
             e.DrawBackground();
@@ -1338,4 +1349,4 @@
             base.OnDrawItem(e);
         }
     }//End of ImageListBox class
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace Maestro.Editors.Common
@@ -28,7 +28,7 @@
     /// The <c>Maestro.Editors.Common</c> namespace provides shared UI components used by resource editor components.
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/RepointerDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/RepointerDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/RepointerDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,40 +1,38 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Generic;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI.Services;
 
 namespace Maestro.Editors.Common
 {
     /// <summary>
     /// A dialog that prompts the user to re-point the dependent resources of a given resource
     /// to a new resource of the user's choosing.
-    /// 
+    ///
     /// This dialog does not perform the re-pointer logic. This dialog simply captures the parameters
     /// required for a re-pointer operation.
     /// </summary>
@@ -75,7 +73,7 @@
         public string Source { get { return txtSource.Text; } }
 
         /// <summary>
-        /// Gets the target resource id we want to re-point 
+        /// Gets the target resource id we want to re-point
         /// </summary>
         public string Target { get { return txtTarget.Text; } }
 
@@ -110,4 +108,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryTreeModel.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryTreeModel.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryTreeModel.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,37 +1,36 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels.Common;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.ObjectModels.Common;
-using System.Drawing;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Editors.Common
 {
-    class DummyNode : TreeNode
+    internal class DummyNode : TreeNode
     {
-
     }
 
     internal class RepositoryModelItem
@@ -133,7 +132,7 @@
             EndUpdate();
         }
 
-        void OnNodeAfterSelect(object sender, TreeViewEventArgs e)
+        private void OnNodeAfterSelect(object sender, TreeViewEventArgs e)
         {
             RepositoryModelItem item = (RepositoryModelItem)e.Node.Tag;
             SetSelectedItem(item);
@@ -147,12 +146,12 @@
                 handler(this, EventArgs.Empty);
         }
 
-        bool IsNodeNotPopulated(TreeNode node)
+        private bool IsNodeNotPopulated(TreeNode node)
         {
             return node.Nodes.Count == 1 && node.Nodes[0].GetType() == typeof(DummyNode);
         }
 
-        void OnNodeAfterExpand(object sender, TreeViewEventArgs e)
+        private void OnNodeAfterExpand(object sender, TreeViewEventArgs e)
         {
             UpdateNode(e.Node);
         }
@@ -201,7 +200,6 @@
                     folders.Add(item.ResourceId, new RepositoryModelItem(item));
                 else if (!HasFilteredTypes() || (HasFilteredTypes() && IsFilteredType(item.ResourceType)))
                     docs.Add(item.ResourceId, new RepositoryModelItem(item));
-
             }
             foreach (var folder in folders.Values)
             {
@@ -215,13 +213,25 @@
 
         private HashSet<string> _filteredTypes = new HashSet<string>();
 
-        public void AddResourceTypeFilter(string rt) { _filteredTypes.Add(rt); }
+        public void AddResourceTypeFilter(string rt)
+        {
+            _filteredTypes.Add(rt);
+        }
 
-        public void ClearResourceTypeFilters() { _filteredTypes.Clear(); }
+        public void ClearResourceTypeFilters()
+        {
+            _filteredTypes.Clear();
+        }
 
-        public bool HasFilteredTypes() { return _filteredTypes.Count > 0; }
+        public bool HasFilteredTypes()
+        {
+            return _filteredTypes.Count > 0;
+        }
 
-        public bool IsFilteredType(string rt) { return _filteredTypes.Contains(rt); }
+        public bool IsFilteredType(string rt)
+        {
+            return _filteredTypes.Contains(rt);
+        }
 
         public System.Collections.IEnumerable GetChildren(RepositoryModelItem item)
         {
@@ -331,4 +341,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels.Common;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 
 namespace Maestro.Editors.Common
 {
@@ -85,10 +81,10 @@
             }
 
             _model = new RepositoryFolderTreeModel(resSvc, trvRepository, bFoldersOnly, bOmitEmptyFolders);
-            _model.ItemSelected += OnItemSelectedInternal; 
+            _model.ItemSelected += OnItemSelectedInternal;
         }
 
-        void OnItemSelectedInternal(object sender, EventArgs e)
+        private void OnItemSelectedInternal(object sender, EventArgs e)
         {
             var h = this.ItemSelected;
             if (h != null)
@@ -123,18 +119,24 @@
         /// Adds a resource type to filter on
         /// </summary>
         /// <param name="rt"></param>
-        public void AddResourceTypeFilter(string rt) { if (_model != null) _model.AddResourceTypeFilter(rt); }
+        public void AddResourceTypeFilter(string rt)
+        {
+            if (_model != null) _model.AddResourceTypeFilter(rt);
+        }
 
         /// <summary>
         /// Clears all applied resource type filters
         /// </summary>
-        public void ClearResourceTypeFilters() { if (_model != null) _model.ClearResourceTypeFilters(); }
+        public void ClearResourceTypeFilters()
+        {
+            if (_model != null) _model.ClearResourceTypeFilters();
+        }
 
         /// <summary>
         /// Gets whether this view has resource type filters applied
         /// </summary>
         /// <returns></returns>
-        public bool HasFilteredTypes() 
+        public bool HasFilteredTypes()
         {
             if (_model != null)
                 return _model.HasFilteredTypes();
@@ -185,4 +187,4 @@
                 h(this, e);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,36 +1,36 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels.Common;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
-using System.Data;
-using System.Text;
+using System.IO;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.ObjectModels.Common;
-using System.IO;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Editors.Common
 {
@@ -83,7 +83,7 @@
             get
             {
                 var items = new List<ResourceDataListResourceData>();
-                foreach(ListViewItem selItem in lstDataFiles.SelectedItems)
+                foreach (ListViewItem selItem in lstDataFiles.SelectedItems)
                 {
                     items.Add(selItem.Tag as ResourceDataListResourceData);
                 }
@@ -207,7 +207,7 @@
         {
             //TODO: Obviously support progress
             BusyWaitDelegate method = () => { DoFileUpload(fileName); return null; };
-            BusyWaitDialog.Run(Strings.TextUploading, method, (obj, ex) => 
+            BusyWaitDialog.Run(Strings.TextUploading, method, (obj, ex) =>
             {
                 LoadResourceData();
                 OnDataListChanged();
@@ -270,7 +270,7 @@
                         try
                         {
                             //TODO: Obviously support progress
-                            BusyWaitDelegate method = () => 
+                            BusyWaitDelegate method = () =>
                             {
                                 IResource res = _edSvc.GetEditedResource();
                                 var stream = res.GetResourceData(item.Name);
@@ -280,7 +280,7 @@
                                 }
                                 return null;
                             };
-                            BusyWaitDialog.Run(Strings.TextDownloading, method, (obj, ex) => 
+                            BusyWaitDialog.Run(Strings.TextDownloading, method, (obj, ex) =>
                             {
                                 if (ex != null)
                                     throw ex;
@@ -306,7 +306,7 @@
 
         private void MarkResourceDataAsSelected(string name)
         {
-            ListViewItem item = null; 
+            ListViewItem item = null;
 
             //Find matching item
             foreach (ListViewItem it in lstDataFiles.Items)
@@ -416,7 +416,7 @@
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     public delegate void ResourceDataSelectionEventHandler(object sender, string dataName);
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,38 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Preview;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels.Common;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Aga.Controls.Tree;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.Common;
-using System.Security.AccessControl;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using Maestro.Editors.Common;
-using Maestro.Editors.Preview;
-using Maestro.Shared.UI;
 
 namespace Maestro.Editors.Generic
 {
@@ -134,7 +130,7 @@
             cmbResourceFilter.Enabled = false;
         }
 
-        void OnFolderSelected(object sender, EventArgs e)
+        private void OnFolderSelected(object sender, EventArgs e)
         {
             UpdateDocumentList();
         }
@@ -150,7 +146,7 @@
                 return;
             if (!ResourceIdentifier.IsFolderResource(folderId))
                 throw new ArgumentException(string.Format(Strings.NotAFolder, folderId));
-            
+
             // Library:// will *always* exist, so fallback to this if given folder doesn't check out
             if (!_resSvc.ResourceExists(folderId))
                 folderId = StringConstants.RootIdentifier;
@@ -159,7 +155,7 @@
             repoView.NavigateTo(folderId);
             this.SelectedFolder = folderId;
 
-            //HACK: Navigating to the specified folder takes away the focus to the 
+            //HACK: Navigating to the specified folder takes away the focus to the
             //name field
             this.ActiveControl = txtName;
         }
@@ -187,8 +183,9 @@
                         {
                             this.Text = Strings.SelectFolder;
                             this.SelectFoldersOnly = true;
-                        } 
+                        }
                         break;
+
                     case ResourcePickerMode.SaveResource:
                         {
                             this.Text = Strings.SaveResource;
@@ -222,22 +219,22 @@
         internal bool UseFilter
         {
             get { return cmbResourceFilter.Visible; }
-            set 
+            set
             {
                 if (value && this.SelectFoldersOnly)
                     throw new InvalidOperationException("Cannot specify a filter when SelectFoldersOnly is true"); //LOCALIZE
-                cmbResourceFilter.Visible = value; lblFilter.Visible = value; 
+                cmbResourceFilter.Visible = value; lblFilter.Visible = value;
             }
         }
-        
+
         /// <summary>
-        /// Gets or sets whether to select folders only. If true, the document view is disabled and 
+        /// Gets or sets whether to select folders only. If true, the document view is disabled and
         /// <see cref="UseFilter"/> is set to false
         /// </summary>
         private bool SelectFoldersOnly
         {
             get { return splitContainer1.Panel2Collapsed; }
-            set 
+            set
             {
                 if (_resourceMode && value)
                     throw new InvalidOperationException("Cannot specify to select folders when dialog is initialized with a resource filter"); //LOCALIZE
@@ -484,10 +481,12 @@
 
         private void RenderPreview(ResourceListResourceDocument doc)
         {
-            BusyWaitDialog.Run(Strings.PrgPreparingResourcePreview, () => {
+            BusyWaitDialog.Run(Strings.PrgPreparingResourcePreview, () =>
+            {
                 var res = _resSvc.GetResource(doc.ResourceId);
                 return DefaultResourcePreviewer.GenerateSymbolDefinitionPreview(res.CurrentConnection, res, picPreview.Width, picPreview.Height);
-            }, (res, ex) => {
+            }, (res, ex) =>
+            {
                 if (ex != null)
                 {
                     ErrorDialog.Show(ex);
@@ -511,16 +510,18 @@
     public enum ResourcePickerMode
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         OpenResource,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         SaveResource,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         OpenFolder
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/SourceDataCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/SourceDataCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/SourceDataCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Windows.Forms;
 
 namespace Maestro.Editors.Common
@@ -34,4 +31,4 @@
             InitializeComponent();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/SymbolPicker.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/SymbolPicker.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/SymbolPicker.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,37 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Generic;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Resource.Conversion;
+using OSGeo.MapGuide.MaestroAPI.Services;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI;
-using Obj = OSGeo.MapGuide.ObjectModels.Common;
-using Maestro.Editors.Generic;
-using System.IO;
-using OSGeo.MapGuide.ObjectModels.DrawingSource;
-using OSGeo.MapGuide.MaestroAPI.Resource.Conversion;
 
 namespace Maestro.Editors.Common
 {
@@ -238,4 +235,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/TextEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/TextEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/TextEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -13,40 +14,40 @@
 //  email: office at alphasierrapapa.com
 //  court of jurisdiction: Landesgericht Leoben
 //
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.TextEditor;
 using ICSharpCode.TextEditor.Document;
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
 using OSGeo.MapGuide.MaestroAPI;
 using System;
-using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.Common
 {
     internal abstract class TextEditorBase : ITextEditor
     {
-        delegate string GetLineInvoker(int index);
-        delegate void WriteInvoker(string text, Color color, Color fore);
+        private delegate string GetLineInvoker(int index);
 
+        private delegate void WriteInvoker(string text, Color color, Color fore);
+
         protected TextEditorControl textEditorControl;
         protected TextArea textArea;
         protected Color customLineColour = Color.LightGray;
@@ -216,12 +217,12 @@
         /// <summary>
         /// Gets the range of the currently selected text.
         /// </summary>
-        ColumnRange GetSelectionRange()
+        private ColumnRange GetSelectionRange()
         {
             return textArea.SelectionManager.GetSelectionAtLine(textArea.Caret.Line);
         }
 
-        void SetIndentStyle(IndentStyle style)
+        private void SetIndentStyle(IndentStyle style)
         {
             if (textEditorControl.InvokeRequired)
             {
@@ -239,7 +240,9 @@
             return false;
         }
 
-        public virtual void SetParent(Control frm) { } 
+        public virtual void SetParent(Control frm)
+        {
+        }
     }
 
     /// <summary>
@@ -311,7 +314,7 @@
         {
             var pt = textArea.Caret.ScreenPosition;
             var cpt = textEditorControl.PointToScreen(pt);
-            int dx = 15; //Shift a bit 
+            int dx = 15; //Shift a bit
             int dy = 0;
 
             //Adjust the postion to accomodate as much space for the auto-complete box as much as possible
@@ -325,7 +328,7 @@
             return pt;
         }
 
-        static bool IsAlphanumeric(Keys key)
+        private static bool IsAlphanumeric(Keys key)
         {
             return (key >= Keys.D0 && key <= Keys.Z);
         }
@@ -347,14 +350,17 @@
                         _autoBox.MoveAutoCompleteSelectionUp();
                         bProcessed = true;
                         break;
+
                     case Keys.Down:
                         _autoBox.MoveAutoCompleteSelectionDown();
                         bProcessed = true;
                         break;
+
                     case Keys.Enter:
                         _autoBox.HandleEnterKey();
                         bProcessed = true;
                         break;
+
                     case Keys.Escape:
                         _autoBox.HideBox();
                         break;
@@ -369,7 +375,7 @@
     /// </summary>
     internal class DefaultTextEditor : TextEditorBase
     {
-        CodeCompletionWindow completionWindow;
+        private CodeCompletionWindow completionWindow;
 
         internal DefaultTextEditor(TextEditorControl textEditor)
             : base(textEditor)
@@ -390,7 +396,7 @@
             }
         }
 
-        void CompletionWindowClosed(object source, EventArgs e)
+        private void CompletionWindowClosed(object source, EventArgs e)
         {
             if (completionWindow != null)
             {
@@ -400,4 +406,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/UnmanagedFileBrowser.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/UnmanagedFileBrowser.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/UnmanagedFileBrowser.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Aga.Controls.Tree;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels.Common;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Text;
+using System.IO;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using Aga.Controls.Tree;
-using OSGeo.MapGuide.ObjectModels.Common;
-using System.IO;
 
 namespace Maestro.Editors.Common
 {
@@ -36,16 +36,19 @@
     /// </summary>
     public partial class UnmanagedFileBrowser : Form
     {
-        abstract class ModelBase<T>
+        private abstract class ModelBase<T>
         {
-            public ModelBase(T item) { this.Tag = item; }
+            public ModelBase(T item)
+            {
+                this.Tag = item;
+            }
 
             public T Tag { get; private set; }
         }
 
-        class FolderModel : ModelBase<UnmanagedDataListUnmanagedDataFolder>
+        private class FolderModel : ModelBase<UnmanagedDataListUnmanagedDataFolder>
         {
-            public FolderModel(UnmanagedDataListUnmanagedDataFolder folder) 
+            public FolderModel(UnmanagedDataListUnmanagedDataFolder folder)
                 : base(folder)
             {
                 this.Name = folder.FolderName;
@@ -59,7 +62,7 @@
             public Image Icon { get { return Properties.Resources.folder_horizontal; } }
         }
 
-        class FolderTreeModel : ITreeModel
+        private class FolderTreeModel : ITreeModel
         {
             private IResourceService _resSvc;
 
@@ -83,7 +86,7 @@
                         }
                     }
                 }
-                else 
+                else
                 {
                     var mdl = treePath.LastNode as FolderModel;
                     if (mdl != null)
@@ -116,22 +119,22 @@
             }
 
             /// <summary>
-            /// 
+            ///
             /// </summary>
             public event EventHandler<TreeModelEventArgs> NodesChanged;
 
             /// <summary>
-            /// 
+            ///
             /// </summary>
             public event EventHandler<TreeModelEventArgs> NodesInserted;
 
             /// <summary>
-            /// 
+            ///
             /// </summary>
             public event EventHandler<TreeModelEventArgs> NodesRemoved;
 
             /// <summary>
-            /// 
+            ///
             /// </summary>
             public event EventHandler<TreePathEventArgs> StructureChanged;
         }
@@ -211,7 +214,7 @@
         /// <value>The selected item.</value>
         public string SelectedItem
         {
-            get 
+            get
             {
                 return SelectedItems[0];
             }
@@ -294,17 +297,22 @@
             {
                 case "EXE": //NOXLATE
                     return IDX_FILE_EXE;
+
                 case "DOC": //NOXLATE
                 case "DOCX": //NOXLATE
                     return IDX_FILE_DOC;
+
                 case "MDB": //NOXLATE
                 case "ACCDB": //NOXLATE
                     return IDX_FILE_MDB;
+
                 case "XLS": //NOXLATE
                 case "XLSX": //NOXLATE
                     return IDX_FILE_XLS;
+
                 case "CSV": //NOXLATE
                     return IDX_FILE_CSV;
+
                 case "MOV": //NOXLATE
                 case "MPG": //NOXLATE
                 case "AVI": //NOXLATE
@@ -313,9 +321,11 @@
                 case "ASF": //NOXLATE
                 case "FLV": //NOXLATE
                     return IDX_FILE_MOVIE;
+
                 case "HTM": //NOXLATE
                 case "HTML": //NOXLATE
                     return IDX_FILE_HTML;
+
                 case "PNG": //NOXLATE
                 case "JPG": //NOXLATE
                 case "GIF": //NOXLATE
@@ -323,15 +333,20 @@
                 case "BMP": //NOXLATE
                 case "TGA": //NOXLATE
                     return IDX_FILE_IMAGE;
+
                 case "PDF": //NOXLATE
                     return IDX_FILE_PDF;
+
                 case "PHP": //NOXLATE
                     return IDX_FILE_PHP;
+
                 case "PPT": //NOXLATE
                 case "PPTX": //NOXLATE
                     return IDX_FILE_PPT;
+
                 case "TXT": //NOXLATE
                     return IDX_FILE_TXT;
+
                 case "ZIP": //NOXLATE
                 case "RAR": //NOXLATE
                 case "ACE": //NOXLATE
@@ -340,28 +355,30 @@
                 case "TAR": //NOXLATE
                 case "BZ2": //NOXLATE
                     return IDX_FILE_ARCHIVE;
+
                 case "XML": //NOXLATE
                     return IDX_FILE_XML;
+
                 default:
                     return IDX_FILE_UNKNOWN;
             }
         }
 
-        const int IDX_FILE_UNKNOWN = 0;
-        const int IDX_FILE_EXE = 1;
-        const int IDX_FILE_DOC = 2;
-        const int IDX_FILE_MDB = 3;
-        const int IDX_FILE_XLS = 4;
-        const int IDX_FILE_CSV = 5;
-        const int IDX_FILE_MOVIE = 6;
-        const int IDX_FILE_HTML = 7;
-        const int IDX_FILE_IMAGE = 8;
-        const int IDX_FILE_PDF = 9;
-        const int IDX_FILE_PHP = 10;
-        const int IDX_FILE_PPT = 11;
-        const int IDX_FILE_TXT = 12;
-        const int IDX_FILE_ARCHIVE = 13;
-        const int IDX_FILE_XML = 14;
+        private const int IDX_FILE_UNKNOWN = 0;
+        private const int IDX_FILE_EXE = 1;
+        private const int IDX_FILE_DOC = 2;
+        private const int IDX_FILE_MDB = 3;
+        private const int IDX_FILE_XLS = 4;
+        private const int IDX_FILE_CSV = 5;
+        private const int IDX_FILE_MOVIE = 6;
+        private const int IDX_FILE_HTML = 7;
+        private const int IDX_FILE_IMAGE = 8;
+        private const int IDX_FILE_PDF = 9;
+        private const int IDX_FILE_PHP = 10;
+        private const int IDX_FILE_PPT = 11;
+        private const int IDX_FILE_TXT = 12;
+        private const int IDX_FILE_ARCHIVE = 13;
+        private const int IDX_FILE_XML = 14;
 
         private void lstResources_SelectedIndexChanged(object sender, EventArgs e)
         {
@@ -390,4 +407,4 @@
             this.DialogResult = DialogResult.OK;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/XmlContentErrorDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/XmlContentErrorDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/XmlContentErrorDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.Common
@@ -44,7 +41,7 @@
 
         /// <summary>
         /// Checks if the given exception is XML related and if so will either
-        /// display the error dialog, or attach the 
+        /// display the error dialog, or attach the
         /// </summary>
         /// <param name="ex"></param>
         /// <param name="origXml"></param>
@@ -127,4 +124,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Diagnostics/FdoCacheViewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Diagnostics/FdoCacheViewer.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Diagnostics/FdoCacheViewer.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Commands;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
+using System.IO;
 using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Commands;
-using System.IO;
 
 namespace Maestro.Editors.Diagnostics
 {
@@ -71,4 +70,4 @@
             txtXml.Text = ToXml(_cmd.Execute());
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Diagnostics/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Diagnostics/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Diagnostics/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace Maestro.Editors.Diagnostics
@@ -29,7 +29,7 @@
     /// interacting with MapGuide APIs related to server diagnostics.
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Diagnostics/ServerStatusMonitor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Diagnostics/ServerStatusMonitor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Diagnostics/ServerStatusMonitor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Services;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
+using System.Globalization;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using System.Globalization;
-using OSGeo.MapGuide.MaestroAPI.Services;
 
 namespace Maestro.Editors.Diagnostics
 {
@@ -46,9 +43,15 @@
             ServerStatusMonitor.HideWindow();
         }
 
-        private void StartTimer() { pollTimer.Start(); }
+        private void StartTimer()
+        {
+            pollTimer.Start();
+        }
 
-        private void StopTimer() { pollTimer.Stop(); }
+        private void StopTimer()
+        {
+            pollTimer.Stop();
+        }
 
         /// <summary>
         /// Initializes with the specified site service
@@ -126,9 +129,9 @@
         private static string ParseKb(string valueBytes)
         {
             double d;
-            if (double.TryParse(valueBytes, 
-                                NumberStyles.AllowThousands, 
-                                System.Threading.Thread.CurrentThread.CurrentUICulture, 
+            if (double.TryParse(valueBytes,
+                                NumberStyles.AllowThousands,
+                                System.Threading.Thread.CurrentThread.CurrentUICulture,
                                 out d))
             {
                 return (d / 1000.0).ToString(System.Threading.Thread.CurrentThread.CurrentUICulture) + " " + Strings.UnitsKb; //NOXLATE
@@ -163,4 +166,4 @@
             lblLastUpdated.Text = Strings.LastUpdated + DateTime.Now.ToString(System.Threading.Thread.CurrentThread.CurrentUICulture);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Diff/CompareResourceDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Diff/CompareResourceDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Diff/CompareResourceDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,30 @@
 #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
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Resource.Comparison;
-using OSGeo.MapGuide.MaestroAPI.Services;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.Diff
@@ -151,4 +147,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,36 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-// 
+//
 
 // Original code by Michael Potter, made available under Public Domain
 //
 // http://www.codeproject.com/Articles/6943/A-Generic-Reusable-Diff-Algorithm-in-C-II/
-#endregion
-using System;
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Resource.Comparison;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Resource.Comparison;
-using System.Collections;
 
 namespace Maestro.Editors.Diff
 {
@@ -47,7 +44,7 @@
             InitializeComponent();
         }
 
-        const string NumFormat = "00000";
+        private const string NumFormat = "00000";
 
         /// <summary>
         /// Initializes a new instance
@@ -77,6 +74,7 @@
                         }
 
                         break;
+
                     case DiffResultSpanStatus.NoChange:
                         for (i = 0; i < drs.Length; i++)
                         {
@@ -92,6 +90,7 @@
                         }
 
                         break;
+
                     case DiffResultSpanStatus.AddDestination:
                         for (i = 0; i < drs.Length; i++)
                         {
@@ -107,6 +106,7 @@
                         }
 
                         break;
+
                     case DiffResultSpanStatus.Replace:
                         for (i = 0; i < drs.Length; i++)
                         {
@@ -123,7 +123,6 @@
 
                         break;
                 }
-
             }
         }
 
@@ -165,4 +164,4 @@
             Results_Resize(sender, e);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Diff/XmlCompareUtil.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Diff/XmlCompareUtil.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Diff/XmlCompareUtil.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,30 @@
 #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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Resource.Comparison;
 using OSGeo.MapGuide.MaestroAPI.Services;
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Xml;
 
 namespace Maestro.Editors.Diff
@@ -99,4 +98,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/DrawingSource/DrawingSourceEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/DrawingSource/DrawingSourceEditorCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/DrawingSource/DrawingSourceEditorCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
+//
+
+#endregion Disclaimer / License
+
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
 
 namespace Maestro.Editors.DrawingSource
 {
@@ -51,4 +48,4 @@
             sourceSectionCtrl.Bind(service);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/DrawingSource/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/DrawingSource/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/DrawingSource/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace Maestro.Editors.DrawingSource
@@ -29,7 +29,7 @@
     /// editing Drawing Sources
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/DrawingSource/SourceSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/DrawingSource/SourceSectionCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/DrawingSource/SourceSectionCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using Maestro.Shared.UI;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.MaestroAPI.Services;
+using Maestro.Shared.UI;
 using OSGeo.MapGuide.ObjectModels.DrawingSource;
+using System;
+using System.ComponentModel;
 
 namespace Maestro.Editors.DrawingSource
 {
@@ -57,7 +53,7 @@
             MarkSelected();
         }
 
-        void OnResourceDataListChanged(object sender, EventArgs e)
+        private void OnResourceDataListChanged(object sender, EventArgs e)
         {
             OnResourceChanged();
         }
@@ -71,7 +67,7 @@
             }
         }
 
-        void OnResourceDataMarked(object sender, string dataName)
+        private void OnResourceDataMarked(object sender, string dataName)
         {
             _dws.SourceName = dataName;
 
@@ -100,4 +96,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/EditorBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/EditorBase.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/EditorBase.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
+using System.ComponentModel;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using System.ComponentModel;
 
 namespace Maestro.Editors
 {
@@ -71,7 +71,10 @@
             }
         }
 
-        internal void RaiseResourceChanged() { OnResourceChanged(); }
+        internal void RaiseResourceChanged()
+        {
+            OnResourceChanged();
+        }
 
         /// <summary>
         /// Called when [resource changed].
@@ -99,4 +102,4 @@
         /// </summary>
         event EventHandler ResourceChanged;
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/CoordSys/CoordSysOverrideDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/CoordSys/CoordSysOverrideDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/CoordSys/CoordSysOverrideDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
 
 namespace Maestro.Editors.FeatureSource.CoordSys
 {
@@ -38,14 +32,14 @@
             InitializeComponent();
         }
 
-        public string CsName 
-        { 
+        public string CsName
+        {
             get { return cmbName.Text; }
             set { cmbName.Text = value; }
         }
 
-        public string CoordinateSystemWkt 
-        { 
+        public string CoordinateSystemWkt
+        {
             get { return txtCoordinateSystem.Text; }
             set { txtCoordinateSystem.Text = value; }
         }
@@ -93,4 +87,4 @@
             CheckSubmitStatus();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/CoordSysOverrideCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/CoordSysOverrideCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/CoordSysOverrideCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using Maestro.Editors.FeatureSource.CoordSys;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using Maestro.Shared.UI;
-using Maestro.Editors.FeatureSource.CoordSys;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using Maestro.Editors.Common;
 
 namespace Maestro.Editors.FeatureSource
 {
@@ -154,4 +151,4 @@
             UpdateSpatialContextList();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/CreateLayersFromFeatureSourceDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/CreateLayersFromFeatureSourceDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/CreateLayersFromFeatureSourceDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Generic;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.FeatureSource
@@ -109,7 +107,7 @@
         {
             get { return txtCreateTargetFolder.Text; }
         }
-        
+
         /// <summary>
         /// Gets the selected feature classes to create default Layer Definition documents for
         /// </summary>
@@ -184,4 +182,4 @@
             EvalButtonState();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/CalculationSettings.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/CalculationSettings.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/CalculationSettings.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.MaestroAPI;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using System.ComponentModel;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.FeatureSource.Extensions
 {
@@ -62,4 +59,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/ExtendedClassSettings.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/ExtendedClassSettings.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/ExtendedClassSettings.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 
 namespace Maestro.Editors.FeatureSource.Extensions
 {
@@ -58,7 +57,7 @@
             ComboBoxBinder.BindSelectedIndexChanged(cmbBaseClass, "SelectedItem", ext, "FeatureClass"); //NOXLATE
         }
 
-        void OnExtensionPropertyChanged(object sender, PropertyChangedEventArgs e)
+        private void OnExtensionPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             OnResourceChanged();
         }
@@ -103,4 +102,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/JoinSettings.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/JoinSettings.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/JoinSettings.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 
 namespace Maestro.Editors.FeatureSource.Extensions
 {
@@ -65,13 +63,14 @@
             _rel = rel;
         }
 
-        void OnPropertyJoinListChanged(object sender, ListChangedEventArgs e)
+        private void OnPropertyJoinListChanged(object sender, ListChangedEventArgs e)
         {
             switch (e.ListChangedType)
-            { 
+            {
                 case ListChangedType.ItemAdded:
                     _rel.AddRelateProperty(_propertyJoins[e.NewIndex]);
                     break;
+
                 case ListChangedType.Reset:
                     _rel.RemoveAllRelateProperties();
                     break;
@@ -160,12 +159,15 @@
                 case RelateTypeEnum.Association:
                     rdAssociation.Checked = true;
                     break;
+
                 case RelateTypeEnum.Inner:
                     rdInner.Checked = true;
                     break;
+
                 case RelateTypeEnum.LeftOuter:
                     rdLeftOuter.Checked = true;
                     break;
+
                 case RelateTypeEnum.RightOuter:
                     rdRightOuter.Checked = true;
                     break;
@@ -180,7 +182,7 @@
             _propertyJoins.ListChanged += new ListChangedEventHandler(OnPropertyJoinListChanged);
         }
 
-        void OnRelationPropertyChanged(object sender, PropertyChangedEventArgs e)
+        private void OnRelationPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             OnResourceChanged();
         }
@@ -239,7 +241,7 @@
                 var featSvc = _edSvc.CurrentConnection.FeatureService;
                 var pc = featSvc.GetClassDefinition(_primaryFeatureSource, _primaryClass);
                 var sc = featSvc.GetClassDefinition(_rel.ResourceId, _secondaryClass);
-                
+
                 var dlg = new SelectJoinKeyDialog(pc, sc);
                 if (dlg.ShowDialog() == DialogResult.OK)
                 {
@@ -259,4 +261,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/SelectJoinKeyDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/SelectJoinKeyDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/SelectJoinKeyDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 
 namespace Maestro.Editors.FeatureSource.Extensions
 {
@@ -84,4 +81,4 @@
             this.DialogResult = DialogResult.OK;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/ExtensionsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/ExtensionsCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/ExtensionsCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,37 +1,36 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Diagnostics;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
 using Maestro.Editors.FeatureSource.Extensions;
-using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.MaestroAPI.Schema;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.FeatureSource
 {
@@ -43,9 +42,9 @@
             InitializeComponent();
         }
 
-        const int IDX_EXTENSION = 0;
-        const int IDX_CALC = 1;
-        const int IDX_JOIN = 2;
+        private const int IDX_EXTENSION = 0;
+        private const int IDX_CALC = 1;
+        private const int IDX_JOIN = 2;
 
         private IFeatureSource _fs;
         private IEditorService _edSvc;
@@ -144,7 +143,7 @@
             _edSvc.Saved -= OnResourceSaved;
         }
 
-        void OnResourceSaved(object sender, EventArgs e)
+        private void OnResourceSaved(object sender, EventArgs e)
         {
             Debug.Assert(!_edSvc.IsNew);
         }
@@ -340,7 +339,7 @@
                     if (ext.FeatureClass != null)
                     {
                         //NOTE: The feature source id here may be session based, but this is still okay
-                        //as we're only giving context (the primary class to join on) for the secondary join UI. 
+                        //as we're only giving context (the primary class to join on) for the secondary join UI.
                         //This feature source id is never written into the actual document
                         var ctl = new JoinSettings(_fs.ResourceID, ext.FeatureClass, join);
                         ctl.Bind(_edSvc);
@@ -367,13 +366,13 @@
                     }
                 }
             }
-            else 
+            else
             {
                 splitContainer1.Panel2.Controls.Clear();
             }
         }
 
-        string[] GetAllClassNames()
+        private string[] GetAllClassNames()
         {
             var names = new List<string>();
             foreach (var sn in _fs.GetSchemaNames())
@@ -383,4 +382,4 @@
             return names.ToArray();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/FeatureSourceEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/FeatureSourceEditorCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/FeatureSourceEditorCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
 using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System.Diagnostics;
-using Maestro.Shared.UI;
-using Maestro.Editors.FeatureSource.Providers.Sdf;
-using Maestro.Editors.FeatureSource.Providers.Shp;
-using Maestro.Editors.FeatureSource.Providers;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.FeatureSource
 {
@@ -64,20 +58,20 @@
                 b.Bind(service);
 
             panel.Dock = DockStyle.Top;
-           
+
             var ov = new CoordSysOverrideCtrl();
             ov.Bind(service);
 
             ov.Dock = DockStyle.Top;
-            
+
             var ext = new ExtensionsCtrl();
             ext.Bind(service);
 
             ext.Dock = DockStyle.Top;
-            
+
             this.Controls.Add(ext);
             this.Controls.Add(ov);
             this.Controls.Add(panel);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/FsEditorMap.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/FsEditorMap.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/FsEditorMap.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,15 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using Maestro.Editors.FeatureSource.Providers;
 using Maestro.Shared.UI;
-using Maestro.Editors.FeatureSource.Providers;
+using System;
+using System.Collections.Generic;
 using System.Xml;
 
 namespace Maestro.Editors.FeatureSource
 {
     internal static class FsEditorMap
     {
-        static Dictionary<string, Type> _editors;
+        private static Dictionary<string, Type> _editors;
 
         static FsEditorMap()
         {
@@ -33,7 +32,7 @@
             }
         }
 
-        static string Normalize(string provider)
+        private static string Normalize(string provider)
         {
             string[] tokens = provider.Split('.'); //NOXLATE
             if (tokens.Length == 2)
@@ -70,4 +69,4 @@
             return panel;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace Maestro.Editors.FeatureSource
@@ -29,7 +29,7 @@
     /// editing Feature Source documents
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/IQueryControl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/IQueryControl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/IQueryControl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Feature;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.FeatureSource.Preview
 {
@@ -39,4 +38,4 @@
         SQL,
         //Aggregate,
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.ObjectModels.Capabilities;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.ObjectModels.Capabilities;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using Maestro.Shared.UI;
 
 namespace Maestro.Editors.FeatureSource.Preview
 {
@@ -57,12 +52,12 @@
             _edSvc = editorService;
         }
 
-        const int IDX_SCHEMA = 0;
-        const int IDX_CLASS = 1;
-        const int IDX_PROP = 2;
-        const int IDX_IDENTITY = 3;
-        const int IDX_GEOMETRY = 4;
-        const int IDX_RASTER = 5;
+        private const int IDX_SCHEMA = 0;
+        private const int IDX_CLASS = 1;
+        private const int IDX_PROP = 2;
+        private const int IDX_IDENTITY = 3;
+        private const int IDX_GEOMETRY = 4;
+        private const int IDX_RASTER = 5;
 
         private string currentFsId;
 
@@ -78,7 +73,7 @@
 
         private IFdoProviderCapabilities _caps;
 
-        class SchemaNodeTag
+        private class SchemaNodeTag
         {
             public string SchemaName { get; set; }
 
@@ -91,7 +86,7 @@
             }
         }
 
-        class ClassNodeTag
+        private class ClassNodeTag
         {
             public string SchemaName { get; set; }
 
@@ -123,9 +118,11 @@
             ClearPreviewPanes();
             trvSchema.Nodes.Clear();
 
-            BusyWaitDialog.Run(Strings.FetchingSchemaNames, () => {
+            BusyWaitDialog.Run(Strings.FetchingSchemaNames, () =>
+            {
                 return _edSvc.CurrentConnection.FeatureService.GetSchemas(currentFsId);
-            }, (res, ex) => {
+            }, (res, ex) =>
+            {
                 if (ex != null)
                 {
                     ErrorDialog.Show(ex);
@@ -262,7 +259,7 @@
 
         private bool hasSql = false;
 
-        void AddPreviewPane(ClassDefinition cls, QueryMode mode)
+        private void AddPreviewPane(ClassDefinition cls, QueryMode mode)
         {
             if (mode == QueryMode.SQL)
             {
@@ -294,7 +291,7 @@
             btnClose.Enabled = (tabPreviews.TabPages.Count > 0);
         }
 
-        ClassDefinition GetSelectedClass()
+        private ClassDefinition GetSelectedClass()
         {
             if (trvSchema.SelectedNode != null)
             {
@@ -322,6 +319,7 @@
                         btnSql.Enabled = false;
                     }
                     break;
+
                 default:
                     btnStandard.Enabled = false;
                     btnSql.Enabled = false;
@@ -381,9 +379,11 @@
                 e.Node.Nodes.Clear();
 
                 string schemaName = schTag.SchemaName;
-                BusyWaitDialog.Run(Strings.FetchingClassNames, () => {
+                BusyWaitDialog.Run(Strings.FetchingClassNames, () =>
+                {
                     return _edSvc.CurrentConnection.FeatureService.GetClassNames(currentFsId, schemaName);
-                }, (res, ex) => {
+                }, (res, ex) =>
+                {
                     if (ex != null)
                     {
                         ErrorDialog.Show(ex);
@@ -413,9 +413,11 @@
                     return;
 
                 string classNameQualified = clsTag.QualifiedName;
-                BusyWaitDialog.Run(Strings.FetchingClassDefinition, () => {
+                BusyWaitDialog.Run(Strings.FetchingClassDefinition, () =>
+                {
                     return _edSvc.CurrentConnection.FeatureService.GetClassDefinition(currentFsId, classNameQualified);
-                }, (res, ex) => {
+                }, (res, ex) =>
+                {
                     if (ex != null)
                     {
                         ErrorDialog.Show(ex);
@@ -430,4 +432,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/PreviewPane.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/PreviewPane.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/PreviewPane.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Feature;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels.Capabilities;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
 using System.Data;
-using System.Text;
+using System.Diagnostics;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using System.Diagnostics;
-using OSGeo.MapGuide.ObjectModels.Capabilities;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.MaestroAPI.Feature;
 
 namespace Maestro.Editors.FeatureSource.Preview
 {
@@ -62,6 +61,7 @@
                     ctrl = new SqlQueryCtrl(fsId, edSvc);
                     _inner = ctrl;
                     break;
+
                 case QueryMode.Standard:
                     ctrl = new StandardQueryCtrl(fsId, edSvc, cls, caps);
                     _inner = ctrl;
@@ -103,7 +103,7 @@
             queryWorker.RunWorkerAsync();
         }
 
-        class QueryResult
+        private class QueryResult
         {
             public DataTable Result { get; set; }
 
@@ -117,7 +117,7 @@
             sw.Start();
             var reader = this.ExecuteQuery();
             try
-            {   
+            {
                 res.Result = new DataTable();
                 InitTable(reader, res.Result);
                 while (reader.ReadNext())
@@ -164,8 +164,8 @@
             }
         }
 
-        DataTable _cancelResult;
-        TimeSpan? _cancelDuration;
+        private DataTable _cancelResult;
+        private TimeSpan? _cancelDuration;
 
         private void queryWorker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
@@ -206,4 +206,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/SqlQueryCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/SqlQueryCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/SqlQueryCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Feature;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI.Feature;
 
 namespace Maestro.Editors.FeatureSource.Preview
 {
@@ -57,4 +54,4 @@
             get { return this; }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/StandardQueryCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/StandardQueryCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/StandardQueryCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,36 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using OSGeo.MapGuide.MaestroAPI.Feature;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.ObjectModels.Capabilities;
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using System.Collections.Specialized;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.Capabilities;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.MaestroAPI.Feature;
 
 namespace Maestro.Editors.FeatureSource.Preview
 {
@@ -180,4 +178,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Common/FilteredLogicalSchemaDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Common/FilteredLogicalSchemaDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Common/FilteredLogicalSchemaDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,36 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.FeatureSource.Providers.Common
 {
     internal partial class FilteredLogicalSchemaDialog : Form
     {
-        public FilteredLogicalSchemaDialog(string [] names)
+        public FilteredLogicalSchemaDialog(string[] names)
         {
             InitializeComponent();
             foreach (var n in names)
@@ -84,4 +82,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using Maestro.Shared.UI;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
 
 namespace Maestro.Editors.FeatureSource.Providers
 {
@@ -65,10 +63,12 @@
 
         protected virtual void OnResourceMarked(string dataName)
         {
-            
         }
 
-        protected virtual string[] GetUnmanagedFileExtensions() { return new string[0]; }
+        protected virtual string[] GetUnmanagedFileExtensions()
+        {
+            return new string[0];
+        }
 
         private void btnBrowseAlias_Click(object sender, EventArgs e)
         {
@@ -112,4 +112,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,41 +1,39 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
-using System.Xml;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using System.IO;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
 using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
 using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using System;
+using System.Collections.Generic;
 using System.Collections.Specialized;
-using Maestro.Editors.Common;
+using System.ComponentModel;
 using System.Globalization;
+using System.IO;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.FeatureSource.Providers.Gdal
 {
@@ -114,7 +112,6 @@
             "<xs:field xpath=\"FeatId\"/></xs:key></xs:element><xs:complexType name=\"defaultType\" abstract=\"false\" fdo:hasGeometry=\"false\"><xs:annotation><xs:appinfo source=\"http://fdo.osgeo.org/schemas\"/></xs:annotation><xs:complexContent><xs:extension base=\"gml:AbstractFeatureType\"><xs:sequence><xs:element name=\"FeatId\"><xs:annotation><xs:appinfo source=\"http://fdo.osgeo.org/schemas\"/></xs:annotation><xs:simpleType><xs:restriction base=\"xs:string\"><xs:maxLength value=\"256\"/></xs:restriction></xs:simpleType></xs:element><xs:element name=\"Raster\" type=\"fdo:RasterPropertyType\" fdo:defaultImageXSize=\"1024\" fdo:defaultImageYSize=\"1024\" fdo:srsName=\"Default\"><xs:annotation>" +  //NOXLATE
             "<xs:appinfo source=\"http://fdo.osgeo.org/schemas\"><fdo:DefaultDataModel dataModelType=\"Bitonal\" dataType=\"Unknown\" organization=\"Pixel\" bitsPerPixel=\"1\" tileSizeX=\"256\" tileSizeY=\"256\"/></xs:appinfo></xs:annotation></xs:element></xs:sequence></xs:extension></xs:complexContent></xs:complexType></xs:schema><SchemaMapping xmlns=\"http://fdogrfp.osgeo.org/schemas\" provider=\"OSGeo.Gdal.3.2\" name=\"default\"></SchemaMapping></fdo:DataStore>";  //NOXLATE
 
-
         private void BuildDefaultDocument()
         {
             _conf = (GdalConfigurationDocument)ConfigurationDocument.LoadXml(string.Format(TEMPLATE_CFG, -10000000, -10000000, 10000000, 10000000));
@@ -138,7 +135,7 @@
 
         private void lstView_SelectedIndexChanged(object sender, EventArgs e)
         {
-            //btnRefresh.Enabled = 
+            //btnRefresh.Enabled =
             btnDelete.Enabled = (lstView.SelectedItems.Count > 0);
         }
 
@@ -218,20 +215,20 @@
             }
         }
 
-        class UpdateConfigResult
+        private class UpdateConfigResult
         {
             public List<string> Added { get; set; }
 
             public List<string> Removed { get; set; }
         }
 
-        object UpdateConfigurationDocument(BackgroundWorker worker, DoWorkEventArgs e, params object[] args)
+        private object UpdateConfigurationDocument(BackgroundWorker worker, DoWorkEventArgs e, params object[] args)
         {
             GdalConfigurationDocument conf = (GdalConfigurationDocument)args[0];
-         
+
             IServerConnection conn = (IServerConnection)args[1];
-            string [] toAdd = args[2] as string[];
-            string [] toRemove = args[3] as string[];
+            string[] toAdd = args[2] as string[];
+            string[] toRemove = args[3] as string[];
             bool isAlias = (bool)args[4];
 
             worker.ReportProgress(0, Strings.UpdatingConfiguration);
@@ -296,7 +293,7 @@
                 conn.ResourceService.SaveResource(fs);
 
                 var scList = fs.GetSpatialInfo(false);
-                
+
                 var raster = new GdalRasterItem();
 
                 if (isAlias)
@@ -401,7 +398,7 @@
                                        .Replace("]%", "]"); //NOXLATE
                     }
                     var list = _service.CurrentConnection.ResourceService.EnumerateUnmanagedData(folder, string.Empty, false, UnmanagedDataTypes.Files);
-                    var extensions = new List<string>(new string[] { 
+                    var extensions = new List<string>(new string[] {
                         ".png", //NOXLATE
                         ".jpg", //NOXLATE
                         ".jpeg", //NOXLATE
@@ -436,4 +433,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/GdalProviderCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/GdalProviderCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/GdalProviderCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
 
 namespace Maestro.Editors.FeatureSource.Providers.Gdal
 {
@@ -59,7 +59,7 @@
                 _bSupportsResample = false;
                 _service = service;
                 _fs = (IFeatureSource)_service.GetEditedResource();
-                
+
                 var provInfo = _service.CurrentConnection.FeatureService.GetFeatureProvider("OSGeo.Gdal"); //NOXLATE
                 foreach (var prop in provInfo.ConnectionProperties)
                 {
@@ -160,4 +160,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using Maestro.Editors.Generic;
-using Maestro.Editors.Common;
 
 namespace Maestro.Editors.FeatureSource.Providers.Gdal
 {
@@ -111,4 +109,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/GenericCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/GenericCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/GenericCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,37 +1,35 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using System.Diagnostics;
-using System.Collections.Specialized;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.FeatureSource.Providers.Odbc;
 
 namespace Maestro.Editors.FeatureSource.Providers
 {
@@ -184,7 +182,6 @@
             return nvc;
         }
 
-
         private void btnTest_Click(object sender, EventArgs e)
         {
             txtTestResult.Text = string.Empty;
@@ -193,7 +190,7 @@
             var cloneFs = (IFeatureSource)_fs.Clone();
             var resSvc = _service.CurrentConnection.ResourceService;
             resSvc.SaveResourceAs(cloneFs, "Session:" + _service.SessionID + "//" + Guid.NewGuid().ToString() + ".FeatureSource"); //NOXLATE
-            
+
             cloneFs.ClearConnectionProperties();
             foreach (var key in param.AllKeys)
             {
@@ -266,7 +263,7 @@
                 if (p != null && p.Enumerable)
                 {
                     var list = _service.CurrentConnection.FeatureService.EnumerateDataStores(txtProvider.Text, GetPartialConnectionString());
-                    foreach(var ds in list.DataStore)
+                    foreach (var ds in list.DataStore)
                     {
                         values.Add(ds.Name);
                     }
@@ -401,4 +398,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/OracleDriver.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/OracleDriver.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/OracleDriver.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace Maestro.Editors.FeatureSource.Providers.Odbc.Drivers
 {
     /// <summary>
@@ -42,8 +41,7 @@
             set
             {
                 var builder = new System.Data.Odbc.OdbcConnectionStringBuilder(value);
-
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/OracleMsDriver.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/OracleMsDriver.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/OracleMsDriver.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace Maestro.Editors.FeatureSource.Providers.Odbc.Drivers
 {
     /// <summary>
@@ -42,8 +41,7 @@
             set
             {
                 var builder = new System.Data.Odbc.OdbcConnectionStringBuilder(value);
-
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/SqlServerDriver.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/SqlServerDriver.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/SqlServerDriver.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.ComponentModel;
 
 namespace Maestro.Editors.FeatureSource.Providers.Odbc.Drivers
@@ -67,8 +67,7 @@
             set
             {
                 var builder = new System.Data.Odbc.OdbcConnectionStringBuilder(value);
-
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcDriverInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcDriverInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcDriverInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace Maestro.Editors.FeatureSource.Providers.Odbc
 {
     /// <summary>
@@ -33,4 +32,4 @@
         /// </summary>
         public abstract string OdbcConnectionString { get; set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcDriverMap.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcDriverMap.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcDriverMap.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Xml;
 
 namespace Maestro.Editors.FeatureSource.Providers.Odbc
 {
     internal static class OdbcDriverMap
     {
-        static Dictionary<string, Type> _drivers;
+        private static Dictionary<string, Type> _drivers;
 
         static OdbcDriverMap()
         {
@@ -54,7 +56,7 @@
         {
             return new List<string>(_drivers.Keys).ToArray();
         }
-        
+
         public static OdbcDriverInfo GetDriver(string provider)
         {
             OdbcDriverInfo driver = null;
@@ -89,18 +91,29 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="OdbcDriverNotFoundException"/> class.
         /// </summary>
-        public OdbcDriverNotFoundException() { }
+        public OdbcDriverNotFoundException()
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="OdbcDriverNotFoundException"/> class.
         /// </summary>
         /// <param name="message">The message.</param>
-        public OdbcDriverNotFoundException(string message) : base(message) { }
+        public OdbcDriverNotFoundException(string message)
+            : base(message)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="OdbcDriverNotFoundException"/> class.
         /// </summary>
         /// <param name="message">The message.</param>
         /// <param name="inner">The inner.</param>
-        public OdbcDriverNotFoundException(string message, Exception inner) : base(message, inner) { }
+        public OdbcDriverNotFoundException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="OdbcDriverNotFoundException"/> class.
         /// </summary>
@@ -109,7 +122,7 @@
         /// <exception cref="T:System.ArgumentNullException">
         /// The <paramref name="info"/> parameter is null.
         ///   </exception>
-        ///   
+        ///
         /// <exception cref="T:System.Runtime.Serialization.SerializationException">
         /// The class name is null or <see cref="P:System.Exception.HResult"/> is zero (0).
         ///   </exception>
@@ -118,4 +131,4 @@
           System.Runtime.Serialization.StreamingContext context)
             : base(info, context) { }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcProviderCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcProviderCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcProviderCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,48 +1,46 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using Maestro.Editors.FeatureSource.Providers.Common;
+using Maestro.Editors.FeatureSource.Providers.Odbc.OverrideEditor;
+using Maestro.Editors.FeatureSource.Providers.Odbc.SubEditors;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Linq;
 using System.Windows.Forms;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using Maestro.Editors.FeatureSource.Providers.Odbc.SubEditors;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
 using System.Xml;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using Maestro.Editors.FeatureSource.Providers.Odbc.OverrideEditor;
-using Maestro.Editors.FeatureSource.Providers.Common;
-using Maestro.Shared.UI;
 
 namespace Maestro.Editors.FeatureSource.Providers.Odbc
 {
     [ToolboxItem(false)]
     internal partial class OdbcProviderCtrl : EditorBindableCollapsiblePanel
     {
-        enum OdbcConnectionMethod
+        private enum OdbcConnectionMethod
         {
             ManagedFile,
             Unmanaged,
@@ -59,9 +57,9 @@
         private IEditorService _service;
         private IFeatureSource _fs;
 
-        bool Use64BitDriver { get { return chkUse64Bit.Visible && chkUse64Bit.Checked; } }
+        private bool Use64BitDriver { get { return chkUse64Bit.Visible && chkUse64Bit.Checked; } }
 
-        void InternalConnectionChanged(object sender, EventArgs e)
+        private void InternalConnectionChanged(object sender, EventArgs e)
         {
             btnTest.Enabled = true;
             var props = (Use64BitDriver) ? this.ChildEditor.Get64BitConnectionProperties() : this.ChildEditor.ConnectionProperties;
@@ -74,7 +72,7 @@
                 OnResourceChanged();
         }
 
-        void RequestedDocumentReset(object sender, EventArgs e)
+        private void RequestedDocumentReset(object sender, EventArgs e)
         {
             DoDocumentReset();
         }
@@ -152,15 +150,19 @@
                 case OdbcConnectionMethod.DSN:
                     childEditor = new DSNCtrl();
                     break;
+
                 case OdbcConnectionMethod.KnownDriver:
                     childEditor = new KnownDriversCtrl();
                     break;
+
                 case OdbcConnectionMethod.ManagedFile:
                     childEditor = new ManagedCtrl();
                     break;
+
                 case OdbcConnectionMethod.RawConnectionString:
                     childEditor = new ConnectionStringCtrl();
                     break;
+
                 case OdbcConnectionMethod.Unmanaged:
                     childEditor = new UnmanagedCtrl();
                     break;
@@ -330,7 +332,7 @@
                 {
                     classNames = names.Select(x => x.Contains(":") ? x.Split(':')[1] : x).ToArray(); //NOXLATE
                     var schema = _fs.CurrentConnection.FeatureService.DescribeFeatureSourcePartial(_fs.ResourceID, schemaName, classNames);
-                    
+
                     _doc.AddSchema(schema); //Only one schema is supported by ODBC so this is ok
                     var scList = _fs.GetSpatialInfo(false);
                     foreach (var sc in scList.SpatialContext)
@@ -339,7 +341,7 @@
                     }
                     return null;
                 };
-                BusyWaitDialog.Run(Strings.TextPreparingConfigurationDocument, worker, (obj, ex) => 
+                BusyWaitDialog.Run(Strings.TextPreparingConfigurationDocument, worker, (obj, ex) =>
                 {
                     if (ex != null)
                         throw ex;
@@ -385,4 +387,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableConfigCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableConfigCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableConfigCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,12 +1,9 @@
-using System;
+using Maestro.Editors.Common;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 
 namespace Maestro.Editors.FeatureSource.Providers.Odbc.OverrideEditor
 {
@@ -229,4 +226,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableConfigurationDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableConfigurationDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableConfigurationDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,12 +1,9 @@
-using System;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 
 namespace Maestro.Editors.FeatureSource.Providers.Odbc.OverrideEditor
 {
@@ -154,4 +151,4 @@
                 txtCoordinateSystem.Text = cs;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableOverrideItem.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableOverrideItem.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableOverrideItem.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using System.ComponentModel;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 
 namespace Maestro.Editors.FeatureSource.Providers.Odbc.OverrideEditor
 {
@@ -115,4 +112,4 @@
 
         public event PropertyChangedEventHandler PropertyChanged;
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ConnectionStringCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ConnectionStringCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ConnectionStringCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
-using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using System.Collections.Specialized;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
 
 namespace Maestro.Editors.FeatureSource.Providers.Odbc.SubEditors
 {
@@ -46,7 +45,7 @@
             _service.RegisterCustomNotifier(this);
         }
 
-        void OnConnectionChanged()
+        private void OnConnectionChanged()
         {
             var handler = this.ConnectionChanged;
             if (handler != null)
@@ -109,4 +108,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/DSNCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/DSNCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/DSNCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
-using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using System.Collections.Specialized;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using Maestro.Editors.Common;
 
 namespace Maestro.Editors.FeatureSource.Providers.Odbc.SubEditors
 {
@@ -41,7 +39,7 @@
 
         private IFeatureSource _fs;
 
-        string[] _dsnNames;
+        private string[] _dsnNames;
 
         public override void Bind(IEditorService service)
         {
@@ -50,7 +48,7 @@
             _dsnNames = service.CurrentConnection.FeatureService.GetConnectionPropertyValues("OSGeo.ODBC", "DataSourceName", string.Empty); //NOXLATE
         }
 
-        void OnConnectionChanged()
+        private void OnConnectionChanged()
         {
             var handler = this.ConnectionChanged;
             if (handler != null)
@@ -102,7 +100,7 @@
             }
         }
 
-        void OnRequestDocumentReset()
+        private void OnRequestDocumentReset()
         {
             var handler = this.RequestDocumentReset;
             if (handler != null)
@@ -111,4 +109,4 @@
 
         public event EventHandler RequestDocumentReset;
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/IOdbcSubEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/IOdbcSubEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/IOdbcSubEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Specialized;
 using System.Windows.Forms;
-using System.Collections.Specialized;
 
 namespace Maestro.Editors.FeatureSource.Providers.Odbc.SubEditors
 {
@@ -37,4 +38,4 @@
 
         NameValueCollection Get64BitConnectionProperties();
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/KnownDriversCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/KnownDriversCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/KnownDriversCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using System.Collections.Specialized;
 
 namespace Maestro.Editors.FeatureSource.Providers.Odbc.SubEditors
 {
@@ -42,7 +41,7 @@
             lstDriver.DataSource = OdbcDriverMap.EnumerateDrivers();
         }
 
-        void OnConnectionChanged()
+        private void OnConnectionChanged()
         {
             var handler = this.ConnectionChanged;
             if (handler != null)
@@ -82,8 +81,8 @@
         public OdbcDriverInfo SelectedDriver
         {
             get { return _SelectedDriver; }
-            set 
-            { 
+            set
+            {
                 _SelectedDriver = value;
                 propGrid.SelectedObject = value;
             }
@@ -97,7 +96,6 @@
             }
         }
 
-
         public event EventHandler RequestDocumentReset;
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ManagedCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ManagedCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ManagedCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
 using System;
-using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using System.Collections.Specialized;
 
 namespace Maestro.Editors.FeatureSource.Providers.Odbc.SubEditors
 {
@@ -39,12 +38,12 @@
             resDataCtrl.ResourceDataUploaded += new Maestro.Editors.Common.ResourceDataCtrl.ResourceUploadEventHandler(OnResourceDataAdded);
         }
 
-        void OnResourceDataAdded(string dataName, string origPath)
+        private void OnResourceDataAdded(string dataName, string origPath)
         {
             OnResourceChanged();
         }
 
-        void OnResourceDataMarked(object sender, string dataName)
+        private void OnResourceDataMarked(object sender, string dataName)
         {
             OnConnectionChanged();
         }
@@ -55,7 +54,7 @@
             resDataCtrl.Init(service);
         }
 
-        void OnConnectionChanged()
+        private void OnConnectionChanged()
         {
             var handler = this.ConnectionChanged;
             if (handler != null)
@@ -119,10 +118,13 @@
             {
                 case ".ACCDB": //NOXLATE
                     return OdbcDriverNames.OdbcDriverAccess64;
+
                 case ".MDB": //NOXLATE
                     return use64Bit ? OdbcDriverNames.OdbcDriverAccess64 : OdbcDriverNames.OdbcDriverAccess;
+
                 case ".XLS": //NOXLATE
                     return use64Bit ? OdbcDriverNames.OdbcDriverExcel64 : OdbcDriverNames.OdbcDriverExcel;
+
                 case ".XLSX": //NOXLATE
                 case ".XLSM": //NOXLATE
                 case ".XLSB": //NOXLATE
@@ -136,7 +138,6 @@
             get { return this; }
         }
 
-
         public event EventHandler RequestDocumentReset;
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using OSGeo.MapGuide.MaestroAPI.Services;
 using System;
-using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using System.Collections.Specialized;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.MaestroAPI.Services;
 
 namespace Maestro.Editors.FeatureSource.Providers.Odbc.SubEditors
 {
@@ -51,7 +50,7 @@
             get { return this; }
         }
 
-        void OnConnectionChanged()
+        private void OnConnectionChanged()
         {
             var handler = this.ConnectionChanged;
             if (handler != null)
@@ -65,10 +64,13 @@
             {
                 case ".ACCDB": //NOXLATE
                     return OdbcDriverNames.OdbcDriverAccess64;
+
                 case ".MDB": //NOXLATE
                     return use64Bit ? OdbcDriverNames.OdbcDriverAccess64 : OdbcDriverNames.OdbcDriverAccess;
+
                 case ".XLS": //NOXLATE
                     return use64Bit ? OdbcDriverNames.OdbcDriverExcel64 : OdbcDriverNames.OdbcDriverExcel;
+
                 case ".XLSX": //NOXLATE
                 case ".XLSM": //NOXLATE
                 case ".XLSB": //NOXLATE
@@ -163,6 +165,7 @@
     {
         //These aren't localizable
         public const string OdbcDriverAccess = "{Microsoft Access Driver (*.mdb)}";
+
         public const string OdbcDriverAccess64 = "{Microsoft Access Driver (*.mdb, *.accdb)}";
         public const string OdbcDriverExcel = "{Microsoft Excel Driver (*.xls)}";
         public const string OdbcDriverExcel64 = "{Microsoft Excel Driver (*.xls, *.xlsx, *.xlsm, *.xlsb)}";
@@ -173,4 +176,4 @@
                    odbcConnStr.Contains(OdbcDriverNames.OdbcDriverExcel64);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/MySqlCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/MySqlCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/MySqlCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
+//
+
+#endregion Disclaimer / License
+
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
 
 namespace Maestro.Editors.FeatureSource.Providers.Rdbms
 {
@@ -51,4 +48,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/PostgreSqlCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/PostgreSqlCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/PostgreSqlCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
+//
+
+#endregion Disclaimer / License
+
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
 
 namespace Maestro.Editors.FeatureSource.Providers.Rdbms
 {
@@ -51,4 +48,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
-using Maestro.Editors.FeatureSource.Providers.Odbc;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.FeatureSource.Providers.Rdbms
 {
@@ -83,7 +82,7 @@
             var dstore = _fs.GetConnectionProperty("DataStore"); //NOXLATE
             txtDataStore.Text = dstore;
 
-            //As our connection properties are not CLR properties, 
+            //As our connection properties are not CLR properties,
             //"manually" bind these fields
             txtService.TextChanged += (s, e) =>
             {
@@ -98,7 +97,7 @@
                 else
                     _fs.SetConnectionProperty("Username", txtUsername.Text); //NOXLATE
             };
-            
+
             txtPassword.TextChanged += (s, e) =>
             {
                 _bChangedPassword = true;
@@ -112,7 +111,6 @@
             {
                 _fs.SetConnectionProperty("DataStore", txtDataStore.Text); //NOXLATE
             };
-
         }
 
         private string GenerateRandomFakeString()
@@ -132,12 +130,12 @@
             return (char)(rng.Next('A', 'Z' + 1));
         }
 
-        void OnBeforePreview(object sender, EventArgs e)
+        private void OnBeforePreview(object sender, EventArgs e)
         {
             WriteEncryptedCredentials();
         }
 
-        void OnBeforeSave(object sender, CancelEventArgs e)
+        private void OnBeforeSave(object sender, CancelEventArgs e)
         {
             WriteEncryptedCredentials();
         }
@@ -236,4 +234,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
+//
+
+#endregion Disclaimer / License
+
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
 
 namespace Maestro.Editors.FeatureSource.Providers.Rdbms
 {
@@ -51,4 +48,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/SQLite/SQLiteFileCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/SQLite/SQLiteFileCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/SQLite/SQLiteFileCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System.Diagnostics;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Editors.FeatureSource.Providers.SQLite
 {
@@ -70,7 +68,7 @@
                     resDataCtrl.MarkedFile = df;
                 }
                 else //if (_fs.UsesAliasedDataFiles)
-                {   
+                {
                     txtAlias.Text = file;
                     rdUnmanaged.Checked = true;
                 }
@@ -109,4 +107,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Sdf/SdfFileCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Sdf/SdfFileCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Sdf/SdfFileCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System.Diagnostics;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Editors.FeatureSource.Providers.Sdf
 {
@@ -114,4 +112,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/SetCredentialsDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/SetCredentialsDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/SetCredentialsDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,29 @@
-#region Disclaimer / License
-// Copyright (C) 2012, 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
+#region Disclaimer / License
+
+// Copyright (C) 2012, 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 Maestro.Editors.Common;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Maestro.Editors.Common;
 
 namespace Maestro.Editors.FeatureSource.Providers
 {
@@ -32,7 +31,7 @@
     {
         private string[] _propertyNames;
 
-        public SetCredentialsDialog(string [] propertyNames)
+        public SetCredentialsDialog(string[] propertyNames)
         {
             InitializeComponent();
             _propertyNames = propertyNames;
@@ -83,10 +82,10 @@
 
         private void CheckSubmissionState()
         {
-            btnOK.Enabled = !string.IsNullOrEmpty(txtUserProperty.Text) && 
-                            !string.IsNullOrEmpty(txtPasswordProperty.Text) && 
-                            !string.IsNullOrEmpty(txtUsername.Text) && 
-                            !string.IsNullOrEmpty(txtPassword.Text) && 
+            btnOK.Enabled = !string.IsNullOrEmpty(txtUserProperty.Text) &&
+                            !string.IsNullOrEmpty(txtPasswordProperty.Text) &&
+                            !string.IsNullOrEmpty(txtUsername.Text) &&
+                            !string.IsNullOrEmpty(txtPassword.Text) &&
                             txtUserProperty.Text != txtPasswordProperty.Text;
         }
 
@@ -110,4 +109,4 @@
             CheckSubmissionState();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Shp/ShpFileCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Shp/ShpFileCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Shp/ShpFileCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System.Diagnostics;
 using System.IO;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Editors.FeatureSource.Providers.Shp
 {
@@ -57,9 +55,9 @@
             resDataCtrl.ResourceDataUploaded += new Maestro.Editors.Common.ResourceDataCtrl.ResourceUploadEventHandler(OnResourceDataUploaded);
         }
 
-        static readonly string[] SHP_RELATED_EXTENSIONS = { ".shx", ".dbf", ".idx", ".prj", ".cpg" }; //NOXLATE
+        private static readonly string[] SHP_RELATED_EXTENSIONS = { ".shx", ".dbf", ".idx", ".prj", ".cpg" }; //NOXLATE
 
-        void OnResourceDataUploaded(string dataName, string origPath)
+        private void OnResourceDataUploaded(string dataName, string origPath)
         {
             //If a SHP file was loaded, we want all of its buddies too
             if (origPath.ToLower().EndsWith(".shp")) //NOXLATE
@@ -142,4 +140,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/RasterDefinitionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/RasterDefinitionCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/RasterDefinitionCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using Maestro.Editors.Common;
 
 namespace Maestro.Editors.FeatureSource.Providers.Wms
 {
@@ -107,7 +107,7 @@
 
         private void btnSelectFormat_Click(object sender, EventArgs e)
         {
-            string[] formats = { RasterWmsItem.WmsImageFormat.GIF, 
+            string[] formats = { RasterWmsItem.WmsImageFormat.GIF,
                                  RasterWmsItem.WmsImageFormat.JPG,
                                  RasterWmsItem.WmsImageFormat.PNG,
                                  RasterWmsItem.WmsImageFormat.TIF };
@@ -118,4 +118,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
+using OSGeo.MapGuide.ObjectModels.Common;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.Common;
-using Maestro.Shared.UI;
 
 namespace Maestro.Editors.FeatureSource.Providers.Wms
 {
@@ -207,7 +205,7 @@
             /*
             var item = (RasterWmsItem)lstFeatureClasses.SelectedItem;
             _items.Remove(item);
-            
+
             //Remove schema mapping item
             _config.RemoveRasterItem(item);
 
@@ -285,7 +283,7 @@
         {
             if (_updatingLogicalClassUI) return;
             if (_logicalClass == null) return;
-            var item = lstFeatureClasses.SelectedItem  as RasterWmsItem;
+            var item = lstFeatureClasses.SelectedItem as RasterWmsItem;
             if (item == null) return;
 
             _logicalClass.Name = txtClassName.Text;
@@ -354,4 +352,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
+using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
+using System;
+using System.ComponentModel;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.FeatureSource.Providers.Wms
 {
@@ -144,4 +142,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/SpatialContextInfoDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/SpatialContextInfoDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/SpatialContextInfoDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +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
-// 
-#endregion
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.Common;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.Globalization;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.FeatureSource
@@ -44,7 +41,7 @@
         /// Creates a new instance of SpatialContextInfoDialog
         /// </summary>
         /// <param name="sc">The spatial context to display</param>
-        public SpatialContextInfoDialog(IFdoSpatialContext sc) 
+        public SpatialContextInfoDialog(IFdoSpatialContext sc)
             : this()
         {
             txtCSName.Text = sc.CoordinateSystemName;
@@ -69,4 +66,4 @@
             this.Close();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/SpatialContextsDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/SpatialContextsDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/SpatialContextsDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.MaestroAPI.Services;
 
 namespace Maestro.Editors.FeatureSource
 {
@@ -70,4 +67,4 @@
             this.Close();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/FsEditorMap.xml
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FsEditorMap.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/FsEditorMap.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<!-- 
+<!--
 This file allows the feature source editor to resolve the correct specialized
 editor based on the given provider name of the feature source. If the editor
 cannot locate this file or fails to parse the entries defined here, the default

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexLayoutSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexLayoutSettingsCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexLayoutSettingsCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
-using System.Data;
-using System.Text;
+using System.Net;
 using System.Windows.Forms;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
-using System.Net;
-using Maestro.Shared.UI;
 
 namespace Maestro.Editors.Fusion
 {
@@ -52,7 +52,7 @@
         {
             _edsvc = service;
             _edsvc.RegisterCustomNotifier(this);
-            
+
             try
             {
                 _fsvc = (IFusionService)_edsvc.GetService((int)ServiceType.Fusion);
@@ -64,7 +64,7 @@
                         _baseUrl += "/"; //NOXLATE
                 }
             }
-            catch 
+            catch
             {
                 throw new NotSupportedException(Strings.IncompatibleConnection);
             }
@@ -86,7 +86,7 @@
             base.UnsubscribeEventHandlers();
         }
 
-        void OnSaved(object sender, EventArgs e)
+        private void OnSaved(object sender, EventArgs e)
         {
             GeneratePreviewUrl();
         }
@@ -183,4 +183,4 @@
             _edsvc.OpenUrl(txtPublicUrl.Text);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 
 namespace Maestro.Editors.Fusion
@@ -58,4 +54,4 @@
             widgetsCtrl.Bind(service);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditorContext.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditorContext.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditorContext.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
-using OSGeo.MapGuide.MaestroAPI;
+using System.Collections.Generic;
 
 namespace Maestro.Editors.Fusion
 {
@@ -141,4 +142,4 @@
             return false;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/FusionWidgetEditorMap.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/FusionWidgetEditorMap.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/FusionWidgetEditorMap.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Fusion.WidgetEditors;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Editors.Fusion
 {
@@ -49,4 +49,4 @@
             return ed;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,39 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Fusion.MapEditors;
+using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
 using System.Linq;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
-using Maestro.Shared.UI;
-using System.Globalization;
-using System.Collections.Specialized;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using System.Diagnostics;
-using Maestro.Editors.Fusion.MapEditors;
 
 namespace Maestro.Editors.Fusion
 {
@@ -50,7 +42,7 @@
         private IApplicationDefinition _appDef;
         private IEditorService _edSvc;
 
-        class MapModel
+        private class MapModel
         {
             private IMap _map;
 
@@ -92,7 +84,8 @@
 
         private BindingList<MapModel> _models;
 
-        public MapCtrl(IApplicationDefinition appDef, IMapGroup group, IEditorService edService, IMapWidget widget) : this() 
+        public MapCtrl(IApplicationDefinition appDef, IMapGroup group, IEditorService edService, IMapWidget widget)
+            : this()
         {
             _appDef = appDef;
             _widget = widget;
@@ -243,4 +236,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/MapEditors/CommercialMapEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/MapEditors/CommercialMapEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/MapEditors/CommercialMapEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,29 @@
 #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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
+using System;
 using System.Diagnostics;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.Fusion.MapEditors
 {
@@ -36,7 +33,7 @@
         private IMap _map;
         private bool _init;
 
-        public CommercialMapEditor(IEditorService edSvc, IMap map, string [] types)
+        public CommercialMapEditor(IEditorService edSvc, IMap map, string[] types)
         {
             InitializeComponent();
             _edSvc = edSvc;
@@ -65,4 +62,4 @@
             _edSvc.HasChanged();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/MapEditors/EditorFactory.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/MapEditors/EditorFactory.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/MapEditors/EditorFactory.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,51 +1,52 @@
 #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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.Fusion.MapEditors
 {
-    class EditorFactory
+    internal class EditorFactory
     {
-        const string G_NORMAL_MAP = "G_NORMAL_MAP"; //NOXLATE
-        const string G_SATELLITE_MAP = "G_SATELLITE_MAP"; //NOXLATE
-        const string G_HYBRID_MAP = "G_HYBRID_MAP"; //NOXLATE
-        const string G_PHYSICAL_MAP = "G_PHYSICAL_MAP"; //NOXLATE
+        private const string G_NORMAL_MAP = "G_NORMAL_MAP"; //NOXLATE
+        private const string G_SATELLITE_MAP = "G_SATELLITE_MAP"; //NOXLATE
+        private const string G_HYBRID_MAP = "G_HYBRID_MAP"; //NOXLATE
+        private const string G_PHYSICAL_MAP = "G_PHYSICAL_MAP"; //NOXLATE
 
-        const string BING_ROAD = "Road"; //NOXLATE
-        const string BING_AERIAL = "Aerial"; //NOXLATE
-        const string BING_HYBRID = "Hybrid"; //NOXLATE
+        private const string BING_ROAD = "Road"; //NOXLATE
+        private const string BING_AERIAL = "Aerial"; //NOXLATE
+        private const string BING_HYBRID = "Hybrid"; //NOXLATE
 
         internal const string Type_Google = "Google"; //NOXLATE
         internal const string Type_Bing = "VirtualEarth"; //NOXLATE
         internal const string Type_OSM = "OpenStreetMap"; //NOXLATE
         internal const string Type_MapGuide = "MapGuide"; //NOXLATE
-        const string Type_Generic = "Generic"; //NOXLATE
+        private const string Type_Generic = "Generic"; //NOXLATE
 
-        const string OSM_MAP_MAPNIK = "Mapnik"; //NOXLATE
-        const string OSM_MAP_TRANSPORTMAP = "TransportMap"; //NOXLATE
-        const string OSM_MAP_CYCLEMAP = "CycleMap"; //NOXLATE
+        private const string OSM_MAP_MAPNIK = "Mapnik"; //NOXLATE
+        private const string OSM_MAP_TRANSPORTMAP = "TransportMap"; //NOXLATE
+        private const string OSM_MAP_CYCLEMAP = "CycleMap"; //NOXLATE
 
         internal const string OSM_URL = "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"; //NOXLATE
         internal const string GOOGLE_URL = "http://maps.google.com/maps/api/js?sensor=false"; //NOXLATE
@@ -57,12 +58,16 @@
             {
                 case Type_Google:
                     return new CommercialMapEditor(edSvc, map, new string[] { G_NORMAL_MAP, G_SATELLITE_MAP, G_HYBRID_MAP, G_PHYSICAL_MAP });
+
                 case Type_Bing:
                     return new CommercialMapEditor(edSvc, map, new string[] { BING_ROAD, BING_AERIAL, BING_HYBRID });
+
                 case Type_OSM:
                     return new CommercialMapEditor(edSvc, map, new string[] { OSM_MAP_MAPNIK, OSM_MAP_CYCLEMAP, OSM_MAP_TRANSPORTMAP });
+
                 case Type_MapGuide:
                     return new MapGuideEditor(edSvc, group, map);
+
                 default:
                     return new GenericEditor(edSvc, map);
             }
@@ -86,10 +91,11 @@
                     return group.CreateGenericEntry();
                 }
             };
-            yield return new EditorInvoker() 
+            yield return new EditorInvoker()
             {
-                Name = Strings.CmsGoogleStreets, 
-                Action = () => {
+                Name = Strings.CmsGoogleStreets,
+                Action = () =>
+                {
                     return group.CreateCmsMapEntry(Type_Google, false, Strings.CmsGoogleStreets, G_NORMAL_MAP);
                 }
             };
@@ -168,10 +174,10 @@
         }
     }
 
-    class EditorInvoker
+    internal class EditorInvoker
     {
         public string Name;
 
         public Func<IMap> Action;
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/MapEditors/GenericEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/MapEditors/GenericEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/MapEditors/GenericEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +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
-// 
-#endregion
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 
 namespace Maestro.Editors.Fusion.MapEditors
 {
@@ -56,4 +53,4 @@
             btnSave.Checked = true;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/MapEditors/MapGuideEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/MapEditors/MapGuideEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/MapEditors/MapGuideEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,31 @@
 #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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Generic;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
+using System;
 using System.Globalization;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Generic;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.Fusion.MapEditors
 {
@@ -180,4 +177,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/MapSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/MapSettingsCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/MapSettingsCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,35 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using Maestro.Editors.Generic;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
-using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 
 namespace Maestro.Editors.Fusion
 {
@@ -248,4 +248,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/MenuCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/MenuCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/MenuCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 
 namespace Maestro.Editors.Fusion
 {
@@ -88,4 +86,4 @@
             _menu.ImageClass = txtImageClass.Text;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/NewWidgetDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/NewWidgetDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/NewWidgetDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 
 namespace Maestro.Editors.Fusion
 {
@@ -69,4 +67,4 @@
             this.DialogResult = DialogResult.OK;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace Maestro.Editors.Fusion
@@ -29,7 +29,7 @@
     /// editing Fusion Application Definition documents
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/GenericWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/GenericWidgetCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/GenericWidgetCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
 using System.Xml;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 
 namespace Maestro.Editors.Fusion.WidgetEditors
 {
@@ -145,4 +145,4 @@
                 new WidgetInfoDialog(_widgetInfo).ShowDialog();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/IWidgetEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/IWidgetEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/IWidgetEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 
 namespace Maestro.Editors.Fusion.WidgetEditors
 {
@@ -43,4 +43,4 @@
         /// </summary>
         Control Content { get; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace Maestro.Editors.Fusion.WidgetEditors
@@ -29,7 +29,7 @@
     /// editing Fusion widgets
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetEditorBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetEditorBase.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetEditorBase.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Shared.UI;
+using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.Fusion.WidgetEditors
 {
@@ -63,4 +60,4 @@
             get { return this; }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetInfoDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetInfoDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetInfoDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.Fusion.WidgetEditors
 {
@@ -44,4 +40,4 @@
             grdExtensionProperties.DataSource = info.Parameters;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetManagementDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetManagementDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetManagementDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 using System.Xml;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Editors.Fusion
 {
@@ -36,7 +36,7 @@
         private FlexibleLayoutEditorContext _context;
         private IEditorService _edsvc;
 
-        class WidgetItem
+        private class WidgetItem
         {
             public string Name { get; set; }
 
@@ -82,7 +82,7 @@
             txtMapWidgetXml.Text = _initMapXml;
         }
 
-        void OnDisposed(object sender, EventArgs e)
+        private void OnDisposed(object sender, EventArgs e)
         {
             var handler = this.ResourceChanged;
             if (handler != null)
@@ -273,4 +273,4 @@
             lblNonDockableNote.Visible = (tabWidgets.SelectedIndex == 1);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetReferenceCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetReferenceCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetReferenceCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
-using OSGeo.MapGuide.MaestroAPI.Services;
 
 namespace Maestro.Editors.Fusion
 {
@@ -67,4 +66,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetSettingsCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetSettingsCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Editors.Fusion
 {
@@ -40,10 +39,10 @@
             InitializeComponent();
         }
 
-        const int IDX_CONTAINER = 0;
-        const int IDX_WIDGET = 1;
-        const int IDX_SEPARATOR = 2;
-        const int IDX_MENU = 3;
+        private const int IDX_CONTAINER = 0;
+        private const int IDX_WIDGET = 1;
+        private const int IDX_SEPARATOR = 2;
+        private const int IDX_MENU = 3;
 
         private IFusionService _fsvc;
         private IApplicationDefinition _flexLayout;
@@ -234,6 +233,7 @@
                         item.PropertyChanged += WeakEventHandler.Wrap<PropertyChangedEventHandler>(itemChange, (eh) => item.PropertyChanged -= eh);
                     }
                     break;
+
                 case UiItemFunctionType.Separator:
                     {
                         node.ImageIndex = node.SelectedImageIndex = IDX_SEPARATOR;
@@ -241,6 +241,7 @@
                         node.Tag = item;
                     }
                     break;
+
                 case UiItemFunctionType.Widget:
                     {
                         node.ImageIndex = node.SelectedImageIndex = IDX_WIDGET;
@@ -373,7 +374,7 @@
                     }
                 }
                 else
-                { 
+                {
                     var menu = parent.Tag as IMenu;
                     if (menu != null && item != null)
                     {
@@ -436,7 +437,6 @@
 
         private void btnAddContainer_Click(object sender, EventArgs e)
         {
-
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace Maestro.Editors.Generic
@@ -29,7 +29,7 @@
     /// other editor components
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/ResourceDataPanel.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/ResourceDataPanel.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/ResourceDataPanel.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI.Services;
 
 namespace Maestro.Editors.Generic
 {
@@ -52,4 +49,4 @@
             resDataCtrl.Init(ed);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/QualifiedName.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/QualifiedName.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/QualifiedName.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -17,21 +18,20 @@
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Xml;
 
 namespace Maestro.Editors.Generic.XmlEditor.AutoCompletion
@@ -40,15 +40,15 @@
     /// An <see cref="XmlQualifiedName"/> with the namespace prefix.
     /// </summary>
     /// <remarks>
-    /// The namespace prefix active for a namespace is 
+    /// The namespace prefix active for a namespace is
     /// needed when an element is inserted via autocompletion. This
-    /// class just adds this extra information alongside the 
+    /// class just adds this extra information alongside the
     /// <see cref="XmlQualifiedName"/>.
     /// </remarks>
     internal class QualifiedName
     {
-        XmlQualifiedName xmlQualifiedName = XmlQualifiedName.Empty;
-        string prefix = String.Empty;
+        private XmlQualifiedName xmlQualifiedName = XmlQualifiedName.Empty;
+        private string prefix = String.Empty;
 
         public QualifiedName()
         {
@@ -87,7 +87,7 @@
         }
 
         /// <summary>
-        /// A qualified name is considered equal if the namespace and 
+        /// A qualified name is considered equal if the namespace and
         /// name are the same.  The prefix is ignored.
         /// </summary>
         public override bool Equals(object obj)
@@ -168,4 +168,4 @@
             return xmlQualifiedName.Name;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/QualifiedNameCollection.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/QualifiedNameCollection.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/QualifiedNameCollection.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -17,22 +18,21 @@
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Maestro.Editors.Generic.XmlEditor.AutoCompletion
 {
@@ -42,7 +42,6 @@
     [Serializable()]
     internal class QualifiedNameCollection : CollectionBase
     {
-
         /// <summary>
         ///   Initializes a new instance of <see cref='QualifiedNameCollection'/>.
         /// </summary>
@@ -91,7 +90,7 @@
         }
 
         /// <summary>
-        ///   Adds a <see cref='QualifiedName'/> with the specified value to the 
+        ///   Adds a <see cref='QualifiedName'/> with the specified value to the
         ///   <see cref='QualifiedNameCollection'/>.
         /// </summary>
         /// <param name='val'>The <see cref='QualifiedName'/> to add.</param>
@@ -132,12 +131,12 @@
         }
 
         /// <summary>
-        ///   Gets a value indicating whether the 
+        ///   Gets a value indicating whether the
         ///    <see cref='QualifiedNameCollection'/> contains the specified <see cref='QualifiedName'/>.
         /// </summary>
         /// <param name='val'>The <see cref='QualifiedName'/> to locate.</param>
         /// <returns>
-        /// <see langword='true'/> if the <see cref='QualifiedName'/> is contained in the collection; 
+        /// <see langword='true'/> if the <see cref='QualifiedName'/> is contained in the collection;
         ///   otherwise, <see langword='false'/>.
         /// </returns>
         /// <seealso cref='QualifiedNameCollection.IndexOf'/>
@@ -147,7 +146,7 @@
         }
 
         /// <summary>
-        ///   Copies the <see cref='QualifiedNameCollection'/> values to a one-dimensional <see cref='Array'/> instance at the 
+        ///   Copies the <see cref='QualifiedNameCollection'/> values to a one-dimensional <see cref='Array'/> instance at the
         ///    specified index.
         /// </summary>
         /// <param name='array'>The one-dimensional <see cref='Array'/> that is the destination of the values copied from <see cref='QualifiedNameCollection'/>.</param>
@@ -168,12 +167,12 @@
         }
 
         /// <summary>
-        ///    Returns the index of a <see cref='QualifiedName'/> in 
+        ///    Returns the index of a <see cref='QualifiedName'/> in
         ///       the <see cref='QualifiedNameCollection'/>.
         /// </summary>
         /// <param name='val'>The <see cref='QualifiedName'/> to locate.</param>
         /// <returns>
-        ///   The index of the <see cref='QualifiedName'/> of <paramref name='val'/> in the 
+        ///   The index of the <see cref='QualifiedName'/> of <paramref name='val'/> in the
         ///   <see cref='QualifiedNameCollection'/>, if found; otherwise, -1.
         /// </returns>
         /// <seealso cref='QualifiedNameCollection.Contains'/>
@@ -258,8 +257,8 @@
         /// <seealso cref='QualifiedName'/>
         public class QualifiedNameEnumerator : IEnumerator
         {
-            IEnumerator baseEnumerator;
-            IEnumerable temp;
+            private IEnumerator baseEnumerator;
+            private IEnumerable temp;
 
             /// <summary>
             ///   Initializes a new instance of <see cref='QualifiedNameEnumerator'/>.
@@ -306,4 +305,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlCompletionData.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlCompletionData.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlCompletionData.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -17,35 +18,34 @@
 // 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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.TextEditor;
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Maestro.Editors.Generic.XmlEditor.AutoCompletion
 {
     /// <summary>
-    /// Holds the text for  namespace, child element or attribute 
+    /// Holds the text for  namespace, child element or attribute
     /// autocomplete (intellisense).
     /// </summary>
     internal class XmlCompletionData : ICompletionData
     {
-        string text;
-        DataType dataType = DataType.XmlElement;
-        string description = String.Empty;
+        private string text;
+        private DataType dataType = DataType.XmlElement;
+        private string description = String.Empty;
 
         /// <summary>
         /// The type of text held in this object.
@@ -142,4 +142,4 @@
             return false;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlCompletionDataCollection.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlCompletionDataCollection.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlCompletionDataCollection.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -17,23 +18,22 @@
 // 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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
 using System;
 using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Maestro.Editors.Generic.XmlEditor.AutoCompletion
 {
@@ -43,7 +43,6 @@
     [Serializable()]
     internal class XmlCompletionDataCollection : CollectionBase
     {
-
         /// <summary>
         ///   Initializes a new instance of <see cref='XmlCompletionDataCollection'/>.
         /// </summary>
@@ -92,7 +91,7 @@
         }
 
         /// <summary>
-        ///   Adds a <see cref='XmlCompletionData'/> with the specified value to the 
+        ///   Adds a <see cref='XmlCompletionData'/> with the specified value to the
         ///   <see cref='XmlCompletionDataCollection'/>.
         /// </summary>
         /// <remarks>
@@ -141,12 +140,12 @@
         }
 
         /// <summary>
-        ///   Gets a value indicating whether the 
+        ///   Gets a value indicating whether the
         ///    <see cref='XmlCompletionDataCollection'/> contains the specified <see cref='XmlCompletionData'/>.
         /// </summary>
         /// <param name='val'>The <see cref='XmlCompletionData'/> to locate.</param>
         /// <returns>
-        /// <see langword='true'/> if the <see cref='XmlCompletionData'/> is contained in the collection; 
+        /// <see langword='true'/> if the <see cref='XmlCompletionData'/> is contained in the collection;
         ///   otherwise, <see langword='false'/>.
         /// </returns>
         /// <seealso cref='XmlCompletionDataCollection.IndexOf'/>
@@ -185,7 +184,7 @@
         }
 
         /// <summary>
-        ///   Copies the <see cref='XmlCompletionDataCollection'/> values to a one-dimensional <see cref='Array'/> instance at the 
+        ///   Copies the <see cref='XmlCompletionDataCollection'/> values to a one-dimensional <see cref='Array'/> instance at the
         ///    specified index.
         /// </summary>
         /// <param name='array'>The one-dimensional <see cref='Array'/> that is the destination of the values copied from <see cref='XmlCompletionDataCollection'/>.</param>
@@ -206,7 +205,7 @@
         }
 
         /// <summary>
-        ///   Copies the <see cref='XmlCompletionDataCollection'/> values to a one-dimensional <see cref='Array'/> instance at the 
+        ///   Copies the <see cref='XmlCompletionDataCollection'/> values to a one-dimensional <see cref='Array'/> instance at the
         ///    specified index.
         /// </summary>
         public void CopyTo(ICompletionData[] array, int index)
@@ -215,12 +214,12 @@
         }
 
         /// <summary>
-        ///    Returns the index of a <see cref='XmlCompletionData'/> in 
+        ///    Returns the index of a <see cref='XmlCompletionData'/> in
         ///       the <see cref='XmlCompletionDataCollection'/>.
         /// </summary>
         /// <param name='val'>The <see cref='XmlCompletionData'/> to locate.</param>
         /// <returns>
-        ///   The index of the <see cref='XmlCompletionData'/> of <paramref name='val'/> in the 
+        ///   The index of the <see cref='XmlCompletionData'/> of <paramref name='val'/> in the
         ///   <see cref='XmlCompletionDataCollection'/>, if found; otherwise, -1.
         /// </returns>
         public int IndexOf(XmlCompletionData val)
@@ -277,8 +276,8 @@
         /// <seealso cref='XmlCompletionData'/>
         public class XmlCompletionDataEnumerator : IEnumerator
         {
-            IEnumerator baseEnumerator;
-            IEnumerable temp;
+            private IEnumerator baseEnumerator;
+            private IEnumerable temp;
 
             /// <summary>
             ///   Initializes a new instance of <see cref='XmlCompletionDataEnumerator'/>.
@@ -325,4 +324,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlCompletionDataProvider.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlCompletionDataProvider.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlCompletionDataProvider.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -17,23 +18,22 @@
 // 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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.TextEditor;
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.Generic.XmlEditor.AutoCompletion
@@ -44,9 +44,9 @@
     /// </summary>
     internal class XmlCompletionDataProvider : ICompletionDataProvider
     {
-        XmlSchemaCompletionDataCollection schemaCompletionDataItems;
-        XmlSchemaCompletionData defaultSchemaCompletionData;
-        string defaultNamespacePrefix = String.Empty;
+        private XmlSchemaCompletionDataCollection schemaCompletionDataItems;
+        private XmlSchemaCompletionData defaultSchemaCompletionData;
+        private string defaultNamespacePrefix = String.Empty;
 
         public XmlCompletionDataProvider(XmlSchemaCompletionDataCollection schemaCompletionDataItems, XmlSchemaCompletionData defaultSchemaCompletionData, string defaultNamespacePrefix)
         {
@@ -55,9 +55,9 @@
             this.defaultNamespacePrefix = defaultNamespacePrefix;
             DefaultIndex = 0;
         }
-        
-        static ImageList smImageList;
 
+        private static ImageList smImageList;
+
         public ImageList ImageList
         {
             get
@@ -98,6 +98,7 @@
                         return schemaCompletionDataItems.GetNamespaceCompletionData(); ;
                     }
                     break;
+
                 case '<':
                     // Child element intellisense.
                     XmlElementPath parentPath = XmlParser.GetParentElementPath(text);
@@ -159,7 +160,6 @@
                 }
                 else if (defaultSchemaCompletionData != null)
                 {
-
                     // Use the default schema namespace if none
                     // specified in a xml element path, otherwise
                     // we will not find any attribute or element matches
@@ -186,7 +186,7 @@
         }
 
         /// <summary>
-        /// Gets the schema completion data that was created from the specified 
+        /// Gets the schema completion data that was created from the specified
         /// schema filename.
         /// </summary>
         public XmlSchemaCompletionData FindSchemaFromFileName(string fileName)
@@ -194,7 +194,7 @@
             return schemaCompletionDataItems.GetSchemaFromFileName(fileName);
         }
 
-        ICompletionData[] GetChildElementCompletionData(XmlElementPath path)
+        private ICompletionData[] GetChildElementCompletionData(XmlElementPath path)
         {
             ICompletionData[] completionData = null;
 
@@ -207,7 +207,7 @@
             return completionData;
         }
 
-        ICompletionData[] GetAttributeCompletionData(XmlElementPath path)
+        private ICompletionData[] GetAttributeCompletionData(XmlElementPath path)
         {
             ICompletionData[] completionData = null;
 
@@ -220,7 +220,7 @@
             return completionData;
         }
 
-        ICompletionData[] GetAttributeValueCompletionData(XmlElementPath path, string name)
+        private ICompletionData[] GetAttributeValueCompletionData(XmlElementPath path, string name)
         {
             ICompletionData[] completionData = null;
 
@@ -262,4 +262,4 @@
             return data.InsertAction(textArea, key);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlElementPath.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlElementPath.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlElementPath.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -17,20 +18,20 @@
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 namespace Maestro.Editors.Generic.XmlEditor.AutoCompletion
@@ -41,7 +42,7 @@
     /// </summary>
     internal class XmlElementPath
     {
-        QualifiedNameCollection elements = new QualifiedNameCollection();
+        private QualifiedNameCollection elements = new QualifiedNameCollection();
 
         public XmlElementPath()
         {
@@ -57,8 +58,8 @@
         }
 
         /// <summary>
-        /// Compacts the path so it only contains the elements that are from 
-        /// the namespace of the last element in the path. 
+        /// Compacts the path so it only contains the elements that are from
+        /// the namespace of the last element in the path.
         /// </summary>
         /// <remarks>This method is used when we need to know the path for a
         /// particular namespace and do not care about the complete path.
@@ -80,7 +81,7 @@
         }
 
         /// <summary>
-        /// An xml element path is considered to be equal if 
+        /// An xml element path is considered to be equal if
         /// each path item has the same name and namespace.
         /// </summary>
         public override bool Equals(object obj)
@@ -91,7 +92,6 @@
             XmlElementPath rhs = (XmlElementPath)obj;
             if (elements.Count == rhs.elements.Count)
             {
-
                 for (int i = 0; i < elements.Count; ++i)
                 {
                     if (!elements[i].Equals(rhs.elements[i]))
@@ -110,7 +110,6 @@
             return elements.GetHashCode();
         }
 
-
         /// <summary>
         /// Gets a string that represents the XmlElementPath.
         /// </summary>
@@ -141,7 +140,7 @@
         /// <summary>
         /// Removes elements up to and including the specified index.
         /// </summary>
-        void RemoveParentElements(int index)
+        private void RemoveParentElements(int index)
         {
             while (index >= 0)
             {
@@ -154,7 +153,7 @@
         /// Finds the first parent that does belong in the specified
         /// namespace.
         /// </summary>
-        int FindNonMatchingParentElement(string namespaceUri)
+        private int FindNonMatchingParentElement(string namespaceUri)
         {
             int index = -1;
 
@@ -175,11 +174,11 @@
         }
 
         /// <summary>
-        /// Returns the qualified name as a string. If the name has a 
+        /// Returns the qualified name as a string. If the name has a
         /// prefix then it returns "prefix:element" otherwise it returns
         /// just the element name.
         /// </summary>
-        static string GetElementToString(QualifiedName name)
+        private static string GetElementToString(QualifiedName name)
         {
             if (name.Prefix.Length > 0)
             {
@@ -188,4 +187,4 @@
             return name.Name;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlParser.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlParser.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlParser.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -17,21 +18,22 @@
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Xml;
@@ -53,10 +55,10 @@
         /// Helper class.  Holds the namespace URI and the prefix currently
         /// in use for this namespace.
         /// </summary>
-        class NamespaceURI
+        private class NamespaceURI
         {
-            string namespaceURI = String.Empty;
-            string prefix = String.Empty;
+            private string namespaceURI = String.Empty;
+            private string prefix = String.Empty;
 
             public NamespaceURI()
             {
@@ -97,9 +99,9 @@
             }
         }
 
-        static readonly char[] whitespaceCharacters = new char[] { ' ', '\n', '\t', '\r' };
+        private static readonly char[] whitespaceCharacters = new char[] { ' ', '\n', '\t', '\r' };
 
-        XmlParser()
+        private XmlParser()
         {
         }
 
@@ -168,7 +170,6 @@
             int currentIndex = index;
             for (int i = 0; i < index; ++i)
             {
-
                 char currentChar = xml[currentIndex];
 
                 if (Char.IsWhiteSpace(currentChar))
@@ -498,7 +499,7 @@
         /// <returns>
         /// Returns the text up to and including the start tag < character.
         /// </returns>
-        static string GetActiveElementStartText(string xml, int index)
+        private static string GetActiveElementStartText(string xml, int index)
         {
             int elementStartIndex = GetActiveElementStartIndex(xml, index);
             if (elementStartIndex >= 0)
@@ -523,7 +524,7 @@
         /// -1 if no start tag character is found or a end tag
         /// > character is found first.
         /// </returns>
-        static int GetActiveElementStartIndex(string xml, int index)
+        private static int GetActiveElementStartIndex(string xml, int index)
         {
             int elementStartIndex = -1;
 
@@ -531,7 +532,6 @@
 
             for (int i = 0; i < index; ++i)
             {
-
                 char currentChar = xml[currentIndex];
                 if (currentChar == '<')
                 {
@@ -557,13 +557,12 @@
         /// -1 if no end tag character is found or a start tag
         /// character is found first.
         /// </returns>
-        static int GetActiveElementEndIndex(string xml, int index)
+        private static int GetActiveElementEndIndex(string xml, int index)
         {
             int elementEndIndex = index;
 
             for (int i = index; i < xml.Length; ++i)
             {
-
                 char currentChar = xml[i];
                 if (currentChar == '>')
                 {
@@ -585,7 +584,7 @@
         /// </summary>
         /// <param name="xml">This string must start at the
         /// element we are interested in.</param>
-        static QualifiedName GetElementName(string xml)
+        private static QualifiedName GetElementName(string xml)
         {
             string name = String.Empty;
 
@@ -610,7 +609,7 @@
         /// </summary>
         /// <param name="xml">This string must start at the
         /// element we are interested in.</param>
-        static NamespaceURI GetElementNamespace(string xml)
+        private static NamespaceURI GetElementNamespace(string xml)
         {
             NamespaceURI namespaceURI = new NamespaceURI();
 
@@ -630,7 +629,7 @@
             return namespaceURI;
         }
 
-        static string ReverseString(string text)
+        private static string ReverseString(string text)
         {
             StringBuilder reversedString = new StringBuilder(text);
 
@@ -652,7 +651,7 @@
         /// <param name="index">The current index.</param>
         /// <returns>The index unchanged if the index is smaller than the
         /// length of the string; otherwise it returns length - 1.</returns>
-        static int GetCorrectedIndex(int length, int index)
+        private static int GetCorrectedIndex(int length, int index)
         {
             if (index >= length)
             {
@@ -664,7 +663,7 @@
         /// <summary>
         /// Gets the active element path given the element text.
         /// </summary>
-        static XmlElementPath GetActiveElementStartPath(string xml, int index, string elementText, QualifiedNameCollection namespaces)
+        private static XmlElementPath GetActiveElementStartPath(string xml, int index, string elementText, QualifiedNameCollection namespaces)
         {
             QualifiedName elementName = GetElementName(elementText);
             if (elementName == null)
@@ -698,7 +697,7 @@
             return path;
         }
 
-        static string GetAttributeName(string xml, int index, bool ignoreWhitespace, bool ignoreQuote, bool ignoreEqualsSign)
+        private static string GetAttributeName(string xml, int index, bool ignoreWhitespace, bool ignoreQuote, bool ignoreEqualsSign)
         {
             string name = String.Empty;
 
@@ -711,7 +710,6 @@
 
             for (int i = 0; i <= index; ++i)
             {
-
                 char currentChar = xml[currentIndex];
 
                 if (IsXmlNameChar(currentChar))
@@ -779,7 +777,7 @@
         /// <summary>
         /// Gets the element name at the specified index.
         /// </summary>
-        static string GetElementNameAtIndex(string xml, int index)
+        private static string GetElementNameAtIndex(string xml, int index)
         {
             int elementStartIndex = GetActiveElementStartIndex(xml, index);
             if (elementStartIndex >= 0 && elementStartIndex < index)
@@ -800,7 +798,7 @@
         /// <summary>
         /// Returns a name and its prefix.
         /// </summary>
-        static QualifiedName GetQualifiedName(string name)
+        private static QualifiedName GetQualifiedName(string name)
         {
             if (name.Length == 0)
             {
@@ -826,7 +824,7 @@
         /// method does not compact the path so it will include all elements
         /// including those in another namespace in the path.
         /// </summary>
-        static XmlElementPath GetFullParentElementPath(string xml, QualifiedNameCollection namespaces)
+        private static XmlElementPath GetFullParentElementPath(string xml, QualifiedNameCollection namespaces)
         {
             XmlElementPath path = new XmlElementPath();
             IDictionary<string, string> namespacesInScope = null;
@@ -848,6 +846,7 @@
                                         path.Elements.Add(elementName);
                                     }
                                     break;
+
                                 case XmlNodeType.EndElement:
                                     path.Elements.RemoveLast();
                                     break;
@@ -876,7 +875,7 @@
         /// <summary>
         /// Finds the namespace for the specified prefix.
         /// </summary>
-        static string GetNamespaceForPrefix(QualifiedNameCollection namespaces, string prefix)
+        private static string GetNamespaceForPrefix(QualifiedNameCollection namespaces, string prefix)
         {
             foreach (QualifiedName name in namespaces)
             {
@@ -898,7 +897,7 @@
         /// <param name="xml"></param>
         /// <param name="namespaces">Returns the namespaces that are
         /// exist in the xml.</param>
-        static XmlElementPath GetActiveElementStartPath(string xml, int index, QualifiedNameCollection namespaces)
+        private static XmlElementPath GetActiveElementStartPath(string xml, int index, QualifiedNameCollection namespaces)
         {
             XmlElementPath path = new XmlElementPath();
             string elementText = GetActiveElementStartText(xml, index);
@@ -917,7 +916,7 @@
         /// </summary>
         /// <remarks>If the index outside the start tag then an empty path
         /// is returned.</remarks>
-        static XmlElementPath GetActiveElementStartPathAtIndex(string xml, int index, QualifiedNameCollection namespaces)
+        private static XmlElementPath GetActiveElementStartPathAtIndex(string xml, int index, QualifiedNameCollection namespaces)
         {
             // Find first non xml element name character to the right of the index.
             index = GetCorrectedIndex(xml.Length, index);
@@ -941,4 +940,4 @@
             return new XmlElementPath();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlSchemaAssociation.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlSchemaAssociation.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlSchemaAssociation.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -17,21 +18,20 @@
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Maestro.Editors.Generic.XmlEditor.AutoCompletion
 {
@@ -40,9 +40,9 @@
     /// </summary>
     internal class XmlSchemaAssociation //: IXmlConvertable
     {
-        string namespaceUri = String.Empty;
-        string extension = String.Empty;
-        string namespacePrefix = String.Empty;
+        private string namespaceUri = String.Empty;
+        private string extension = String.Empty;
+        private string namespacePrefix = String.Empty;
 
         public XmlSchemaAssociation(string extension)
             : this(extension, String.Empty, String.Empty)
@@ -108,7 +108,7 @@
         }
 
         /// <summary>
-        /// Gets the default schema association for the file extension. 
+        /// Gets the default schema association for the file extension.
         /// </summary>
         /// <remarks>
         /// These defaults are hard coded.
@@ -122,28 +122,36 @@
                 case ".wxs":
                     association = new XmlSchemaAssociation(extension, @"http://schemas.microsoft.com/wix/2003/01/wi");
                     break;
+
                 case ".config":
                     association = new XmlSchemaAssociation(extension, @"urn:app-config");
                     break;
+
                 case ".build":
                     association = new XmlSchemaAssociation(extension, @"http://nant.sf.net/release/0.85/nant.xsd");
                     break;
+
                 case ".addin":
                     association = new XmlSchemaAssociation(extension, @"http://www.icsharpcode.net/2005/addin");
                     break;
+
                 case ".xsl":
                 case ".xslt":
                     association = new XmlSchemaAssociation(extension, @"http://www.w3.org/1999/XSL/Transform", "xsl");
                     break;
+
                 case ".xsd":
                     association = new XmlSchemaAssociation(extension, @"http://www.w3.org/2001/XMLSchema", "xs");
                     break;
+
                 case ".manifest":
                     association = new XmlSchemaAssociation(extension, @"urn:schemas-microsoft-com:asm.v1");
                     break;
+
                 case ".xaml":
                     association = new XmlSchemaAssociation(extension, @"http://schemas.microsoft.com/winfx/avalon/2005");
                     break;
+
                 default:
                     association = new XmlSchemaAssociation(extension);
                     break;
@@ -192,4 +200,4 @@
             return extension + "|" + namespaceUri + "|" + namespacePrefix;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlSchemaCompletionData.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlSchemaCompletionData.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlSchemaCompletionData.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -17,22 +18,22 @@
 // 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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Xml;
 using System.Xml.Schema;
@@ -43,30 +44,30 @@
     /// Holds the completion (intellisense) data for an xml schema.
     /// </summary>
     /// <remarks>
-    /// The XmlSchema class throws an exception if we attempt to load 
+    /// The XmlSchema class throws an exception if we attempt to load
     /// the xhtml1-strict.xsd schema.  It does not like the fact that
     /// this schema redefines the xml namespace, even though this is
     /// allowed by the w3.org specification.
     /// </remarks>
     internal class XmlSchemaCompletionData
     {
-        string namespaceUri = String.Empty;
-        XmlSchema schema;
-        string fileName = String.Empty;
-        bool readOnly = false;
+        private string namespaceUri = String.Empty;
+        private XmlSchema schema;
+        private string fileName = String.Empty;
+        private bool readOnly = false;
 
         /// <summary>
         /// Stores attributes that have been prohibited whilst the code
         /// generates the attribute completion data.
         /// </summary>
-        XmlSchemaObjectCollection prohibitedAttributes = new XmlSchemaObjectCollection();
+        private XmlSchemaObjectCollection prohibitedAttributes = new XmlSchemaObjectCollection();
 
         public XmlSchemaCompletionData()
         {
         }
 
         /// <summary>
-        /// Creates completion data from the schema passed in 
+        /// Creates completion data from the schema passed in
         /// via the reader object.
         /// </summary>
         public XmlSchemaCompletionData(TextReader reader)
@@ -75,7 +76,7 @@
         }
 
         /// <summary>
-        /// Creates completion data from the schema passed in 
+        /// Creates completion data from the schema passed in
         /// via the reader object.
         /// </summary>
         public XmlSchemaCompletionData(XmlTextReader reader)
@@ -115,7 +116,7 @@
         }
 
         /// <summary>
-        /// Read only schemas are those that are installed with 
+        /// Read only schemas are those that are installed with
         /// SharpDevelop.
         /// </summary>
         public bool ReadOnly
@@ -303,7 +304,7 @@
         /// Finds an element in the schema.
         /// </summary>
         /// <remarks>
-        /// Only looks at the elements that are defined in the 
+        /// Only looks at the elements that are defined in the
         /// root of the schema so it will not find any elements
         /// that are defined inside any complex types.
         /// </remarks>
@@ -405,7 +406,7 @@
         /// Takes the name and creates a qualified name using the namespace of this
         /// schema.
         /// </summary>
-        /// <remarks>If the name is of the form myprefix:mytype then the correct 
+        /// <remarks>If the name is of the form myprefix:mytype then the correct
         /// namespace is determined from the prefix. If the name is not of this
         /// form then no prefix is added.</remarks>
         public QualifiedName CreateQualifiedName(string name)
@@ -444,7 +445,7 @@
         /// <summary>
         /// Handler for schema validation errors.
         /// </summary>
-        void SchemaValidation(object source, ValidationEventArgs e)
+        private void SchemaValidation(object source, ValidationEventArgs e)
         {
             // Do nothing.
         }
@@ -452,7 +453,7 @@
         /// <summary>
         /// Loads the schema.
         /// </summary>
-        void ReadSchema(XmlReader reader)
+        private void ReadSchema(XmlReader reader)
         {
             try
             {
@@ -467,7 +468,7 @@
             }
         }
 
-        void ReadSchema(string baseUri, TextReader reader)
+        private void ReadSchema(string baseUri, TextReader reader)
         {
             XmlTextReader xmlReader = new XmlTextReader(baseUri, reader);
 
@@ -484,11 +485,11 @@
         /// Finds an element in the schema.
         /// </summary>
         /// <remarks>
-        /// Only looks at the elements that are defined in the 
+        /// Only looks at the elements that are defined in the
         /// root of the schema so it will not find any elements
         /// that are defined inside any complex types.
         /// </remarks>
-        XmlSchemaElement FindElement(XmlQualifiedName name)
+        private XmlSchemaElement FindElement(XmlQualifiedName name)
         {
             XmlSchemaElement matchedElement = null;
             foreach (XmlSchemaElement element in schema.Elements.Values)
@@ -503,7 +504,7 @@
             return matchedElement;
         }
 
-        XmlCompletionDataCollection GetChildElementCompletionData(XmlSchemaElement element, string prefix)
+        private XmlCompletionDataCollection GetChildElementCompletionData(XmlSchemaElement element, string prefix)
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
 
@@ -517,7 +518,7 @@
             return data;
         }
 
-        XmlCompletionDataCollection GetChildElementCompletionData(XmlSchemaComplexType complexType, string prefix)
+        private XmlCompletionDataCollection GetChildElementCompletionData(XmlSchemaComplexType complexType, string prefix)
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
 
@@ -551,13 +552,12 @@
             return data;
         }
 
-        XmlCompletionDataCollection GetChildElementCompletionData(XmlSchemaObjectCollection items, string prefix)
+        private XmlCompletionDataCollection GetChildElementCompletionData(XmlSchemaObjectCollection items, string prefix)
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
 
             foreach (XmlSchemaObject schemaObject in items)
             {
-
                 XmlSchemaElement childElement = schemaObject as XmlSchemaElement;
                 XmlSchemaSequence childSequence = schemaObject as XmlSchemaSequence;
                 XmlSchemaChoice childChoice = schemaObject as XmlSchemaChoice;
@@ -608,7 +608,7 @@
             return data;
         }
 
-        XmlCompletionDataCollection GetChildElementCompletionData(XmlSchemaComplexContent complexContent, string prefix)
+        private XmlCompletionDataCollection GetChildElementCompletionData(XmlSchemaComplexContent complexContent, string prefix)
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
 
@@ -629,7 +629,7 @@
             return data;
         }
 
-        XmlCompletionDataCollection GetChildElementCompletionData(XmlSchemaComplexContentExtension extension, string prefix)
+        private XmlCompletionDataCollection GetChildElementCompletionData(XmlSchemaComplexContentExtension extension, string prefix)
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
 
@@ -663,7 +663,7 @@
             return data;
         }
 
-        XmlCompletionDataCollection GetChildElementCompletionData(XmlSchemaGroupRef groupRef, string prefix)
+        private XmlCompletionDataCollection GetChildElementCompletionData(XmlSchemaGroupRef groupRef, string prefix)
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
 
@@ -686,7 +686,7 @@
             return data;
         }
 
-        XmlCompletionDataCollection GetChildElementCompletionData(XmlSchemaComplexContentRestriction restriction, string prefix)
+        private XmlCompletionDataCollection GetChildElementCompletionData(XmlSchemaComplexContentRestriction restriction, string prefix)
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
 
@@ -715,10 +715,10 @@
         }
 
         /// <summary>
-        /// Adds an element completion data to the collection if it does not 
+        /// Adds an element completion data to the collection if it does not
         /// already exist.
         /// </summary>
-        void AddElement(XmlCompletionDataCollection data, string name, string prefix, string documentation)
+        private void AddElement(XmlCompletionDataCollection data, string name, string prefix, string documentation)
         {
             if (!data.Contains(name))
             {
@@ -732,10 +732,10 @@
         }
 
         /// <summary>
-        /// Adds an element completion data to the collection if it does not 
+        /// Adds an element completion data to the collection if it does not
         /// already exist.
         /// </summary>
-        void AddElement(XmlCompletionDataCollection data, string name, string prefix, XmlSchemaAnnotation annotation)
+        private void AddElement(XmlCompletionDataCollection data, string name, string prefix, XmlSchemaAnnotation annotation)
         {
             // Get any annotation documentation.
             string documentation = GetDocumentation(annotation);
@@ -746,7 +746,7 @@
         /// <summary>
         /// Adds elements to the collection if it does not already exist.
         /// </summary>
-        void AddElements(XmlCompletionDataCollection lhs, XmlCompletionDataCollection rhs)
+        private void AddElements(XmlCompletionDataCollection lhs, XmlCompletionDataCollection rhs)
         {
             foreach (XmlCompletionData data in rhs)
             {
@@ -764,7 +764,7 @@
         /// All documentation elements are added.  All text nodes inside
         /// the documentation element are added.
         /// </remarks>
-        string GetDocumentation(XmlSchemaAnnotation annotation)
+        private string GetDocumentation(XmlSchemaAnnotation annotation)
         {
             string documentation = String.Empty;
 
@@ -799,7 +799,7 @@
             return documentation;
         }
 
-        XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaElement element)
+        private XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaElement element)
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
 
@@ -813,7 +813,7 @@
             return data;
         }
 
-        XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaComplexContentRestriction restriction)
+        private XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaComplexContentRestriction restriction)
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
 
@@ -828,7 +828,7 @@
             return data;
         }
 
-        XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaComplexType complexType)
+        private XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaComplexType complexType)
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
 
@@ -861,7 +861,7 @@
             return data;
         }
 
-        XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaComplexContentExtension extension)
+        private XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaComplexContentExtension extension)
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
 
@@ -875,7 +875,7 @@
             return data;
         }
 
-        XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaSimpleContent simpleContent)
+        private XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaSimpleContent simpleContent)
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
 
@@ -888,7 +888,7 @@
             return data;
         }
 
-        XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaSimpleContentExtension extension)
+        private XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaSimpleContentExtension extension)
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
 
@@ -897,7 +897,7 @@
             return data;
         }
 
-        XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaObjectCollection attributes)
+        private XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaObjectCollection attributes)
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
 
@@ -926,9 +926,9 @@
 
         /// <summary>
         /// Checks that the attribute is prohibited or has been flagged
-        /// as prohibited previously. 
+        /// as prohibited previously.
         /// </summary>
-        bool IsProhibitedAttribute(XmlSchemaAttribute attribute)
+        private bool IsProhibitedAttribute(XmlSchemaAttribute attribute)
         {
             bool prohibited = false;
             if (attribute.Use == XmlSchemaUse.Prohibited)
@@ -956,7 +956,7 @@
         /// <remarks>
         /// Note the special handling of xml:lang attributes.
         /// </remarks>
-        void AddAttribute(XmlCompletionDataCollection data, XmlSchemaAttribute attribute)
+        private void AddAttribute(XmlCompletionDataCollection data, XmlSchemaAttribute attribute)
         {
             string name = attribute.Name;
             if (name == null)
@@ -978,7 +978,7 @@
         /// <summary>
         /// Gets attribute completion data from a group ref.
         /// </summary>
-        XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaAttributeGroupRef groupRef)
+        private XmlCompletionDataCollection GetAttributeCompletionData(XmlSchemaAttributeGroupRef groupRef)
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
             XmlSchemaAttributeGroup group = FindAttributeGroup(schema, groupRef.RefName.Name);
@@ -990,7 +990,7 @@
             return data;
         }
 
-        static XmlSchemaComplexType FindNamedType(XmlSchema schema, XmlQualifiedName name)
+        private static XmlSchemaComplexType FindNamedType(XmlSchema schema, XmlQualifiedName name)
         {
             XmlSchemaComplexType matchedComplexType = null;
 
@@ -1033,7 +1033,7 @@
         /// Finds an element that matches the specified <paramref name="name"/>
         /// from the children of the given <paramref name="element"/>.
         /// </summary>
-        XmlSchemaElement FindChildElement(XmlSchemaElement element, QualifiedName name)
+        private XmlSchemaElement FindChildElement(XmlSchemaElement element, QualifiedName name)
         {
             XmlSchemaElement matchedElement = null;
 
@@ -1046,7 +1046,7 @@
             return matchedElement;
         }
 
-        XmlSchemaElement FindChildElement(XmlSchemaComplexType complexType, QualifiedName name)
+        private XmlSchemaElement FindChildElement(XmlSchemaComplexType complexType, QualifiedName name)
         {
             XmlSchemaElement matchedElement = null;
 
@@ -1092,7 +1092,7 @@
         /// <summary>
         /// Finds the named child element contained in the extension element.
         /// </summary>
-        XmlSchemaElement FindChildElement(XmlSchemaComplexContentExtension extension, QualifiedName name)
+        private XmlSchemaElement FindChildElement(XmlSchemaComplexContentExtension extension, QualifiedName name)
         {
             XmlSchemaElement matchedElement = null;
 
@@ -1103,7 +1103,6 @@
 
                 if (matchedElement == null)
                 {
-
                     XmlSchemaSequence sequence = extension.Particle as XmlSchemaSequence;
                     XmlSchemaChoice choice = extension.Particle as XmlSchemaChoice;
                     XmlSchemaGroupRef groupRef = extension.Particle as XmlSchemaGroupRef;
@@ -1129,7 +1128,7 @@
         /// <summary>
         /// Finds the named child element contained in the restriction element.
         /// </summary>
-        XmlSchemaElement FindChildElement(XmlSchemaComplexContentRestriction restriction, QualifiedName name)
+        private XmlSchemaElement FindChildElement(XmlSchemaComplexContentRestriction restriction, QualifiedName name)
         {
             XmlSchemaElement matchedElement = null;
             XmlSchemaSequence sequence = restriction.Particle as XmlSchemaSequence;
@@ -1150,7 +1149,7 @@
         /// <summary>
         /// Finds the element in the collection of schema objects.
         /// </summary>
-        XmlSchemaElement FindElement(XmlSchemaObjectCollection items, QualifiedName name)
+        private XmlSchemaElement FindElement(XmlSchemaObjectCollection items, QualifiedName name)
         {
             XmlSchemaElement matchedElement = null;
 
@@ -1210,7 +1209,7 @@
             return matchedElement;
         }
 
-        XmlSchemaElement FindElement(XmlSchemaGroupRef groupRef, QualifiedName name)
+        private XmlSchemaElement FindElement(XmlSchemaGroupRef groupRef, QualifiedName name)
         {
             XmlSchemaElement matchedElement = null;
 
@@ -1233,7 +1232,7 @@
             return matchedElement;
         }
 
-        static XmlSchemaAttributeGroup FindAttributeGroup(XmlSchema schema, string name)
+        private static XmlSchemaAttributeGroup FindAttributeGroup(XmlSchema schema, string name)
         {
             XmlSchemaAttributeGroup matchedGroup = null;
 
@@ -1241,7 +1240,6 @@
             {
                 foreach (XmlSchemaObject schemaObject in schema.Items)
                 {
-
                     XmlSchemaAttributeGroup group = schemaObject as XmlSchemaAttributeGroup;
                     if (group != null)
                     {
@@ -1273,7 +1271,7 @@
             return matchedGroup;
         }
 
-        XmlCompletionDataCollection GetAttributeValueCompletionData(XmlSchemaElement element, string name)
+        private XmlCompletionDataCollection GetAttributeValueCompletionData(XmlSchemaElement element, string name)
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
 
@@ -1290,7 +1288,7 @@
             return data;
         }
 
-        XmlCompletionDataCollection GetAttributeValueCompletionData(XmlSchemaAttribute attribute)
+        private XmlCompletionDataCollection GetAttributeValueCompletionData(XmlSchemaAttribute attribute)
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
 
@@ -1322,7 +1320,7 @@
             return data;
         }
 
-        XmlCompletionDataCollection GetAttributeValueCompletionData(XmlSchemaSimpleTypeRestriction simpleTypeRestriction)
+        private XmlCompletionDataCollection GetAttributeValueCompletionData(XmlSchemaSimpleTypeRestriction simpleTypeRestriction)
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
 
@@ -1338,7 +1336,7 @@
             return data;
         }
 
-        XmlCompletionDataCollection GetAttributeValueCompletionData(XmlSchemaSimpleTypeUnion union)
+        private XmlCompletionDataCollection GetAttributeValueCompletionData(XmlSchemaSimpleTypeUnion union)
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
 
@@ -1354,7 +1352,7 @@
             return data;
         }
 
-        XmlCompletionDataCollection GetAttributeValueCompletionData(XmlSchemaSimpleType simpleType)
+        private XmlCompletionDataCollection GetAttributeValueCompletionData(XmlSchemaSimpleType simpleType)
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
 
@@ -1378,7 +1376,7 @@
             return data;
         }
 
-        XmlCompletionDataCollection GetAttributeValueCompletionData(XmlSchemaSimpleTypeList list)
+        private XmlCompletionDataCollection GetAttributeValueCompletionData(XmlSchemaSimpleTypeList list)
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
 
@@ -1401,7 +1399,7 @@
         /// <summary>
         /// Gets the set of attribute values for an xs:boolean type.
         /// </summary>
-        XmlCompletionDataCollection GetBooleanAttributeValueCompletionData()
+        private XmlCompletionDataCollection GetBooleanAttributeValueCompletionData()
         {
             XmlCompletionDataCollection data = new XmlCompletionDataCollection();
 
@@ -1413,7 +1411,7 @@
             return data;
         }
 
-        XmlSchemaAttribute FindAttribute(XmlSchemaComplexType complexType, string name)
+        private XmlSchemaAttribute FindAttribute(XmlSchemaComplexType complexType, string name)
         {
             XmlSchemaAttribute matchedAttribute = null;
 
@@ -1431,7 +1429,7 @@
             return matchedAttribute;
         }
 
-        XmlSchemaAttribute FindAttribute(XmlSchemaObjectCollection schemaObjects, string name)
+        private XmlSchemaAttribute FindAttribute(XmlSchemaObjectCollection schemaObjects, string name)
         {
             XmlSchemaAttribute matchedAttribute = null;
 
@@ -1461,7 +1459,7 @@
             return matchedAttribute;
         }
 
-        XmlSchemaAttribute FindAttribute(XmlSchemaAttributeGroupRef groupRef, string name)
+        private XmlSchemaAttribute FindAttribute(XmlSchemaAttributeGroupRef groupRef, string name)
         {
             XmlSchemaAttribute matchedAttribute = null;
 
@@ -1477,7 +1475,7 @@
             return matchedAttribute;
         }
 
-        XmlSchemaAttribute FindAttribute(XmlSchemaComplexContent complexContent, string name)
+        private XmlSchemaAttribute FindAttribute(XmlSchemaComplexContent complexContent, string name)
         {
             XmlSchemaAttribute matchedAttribute = null;
 
@@ -1496,12 +1494,12 @@
             return matchedAttribute;
         }
 
-        XmlSchemaAttribute FindAttribute(XmlSchemaComplexContentExtension extension, string name)
+        private XmlSchemaAttribute FindAttribute(XmlSchemaComplexContentExtension extension, string name)
         {
             return FindAttribute(extension.Attributes, name);
         }
 
-        XmlSchemaAttribute FindAttribute(XmlSchemaComplexContentRestriction restriction, string name)
+        private XmlSchemaAttribute FindAttribute(XmlSchemaComplexContentRestriction restriction, string name)
         {
             XmlSchemaAttribute matchedAttribute = FindAttribute(restriction.Attributes, name);
 
@@ -1520,7 +1518,7 @@
         /// <summary>
         /// Adds an attribute value to the completion data collection.
         /// </summary>
-        void AddAttributeValue(XmlCompletionDataCollection data, string valueText)
+        private void AddAttributeValue(XmlCompletionDataCollection data, string valueText)
         {
             XmlCompletionData completionData = new XmlCompletionData(valueText, XmlCompletionData.DataType.XmlAttributeValue);
             data.Add(completionData);
@@ -1529,7 +1527,7 @@
         /// <summary>
         /// Adds an attribute value to the completion data collection.
         /// </summary>
-        void AddAttributeValue(XmlCompletionDataCollection data, string valueText, XmlSchemaAnnotation annotation)
+        private void AddAttributeValue(XmlCompletionDataCollection data, string valueText, XmlSchemaAnnotation annotation)
         {
             string documentation = GetDocumentation(annotation);
             XmlCompletionData completionData = new XmlCompletionData(valueText, documentation, XmlCompletionData.DataType.XmlAttributeValue);
@@ -1539,13 +1537,13 @@
         /// <summary>
         /// Adds an attribute value to the completion data collection.
         /// </summary>
-        void AddAttributeValue(XmlCompletionDataCollection data, string valueText, string description)
+        private void AddAttributeValue(XmlCompletionDataCollection data, string valueText, string description)
         {
             XmlCompletionData completionData = new XmlCompletionData(valueText, description, XmlCompletionData.DataType.XmlAttributeValue);
             data.Add(completionData);
         }
 
-        XmlSchemaSimpleType FindSimpleType(XmlQualifiedName name)
+        private XmlSchemaSimpleType FindSimpleType(XmlQualifiedName name)
         {
             XmlSchemaSimpleType matchedSimpleType = null;
 
@@ -1568,7 +1566,7 @@
         /// <summary>
         /// Adds any elements that have the specified substitution group.
         /// </summary>
-        void AddSubstitionGroupElements(XmlCompletionDataCollection data, XmlQualifiedName group, string prefix)
+        private void AddSubstitionGroupElements(XmlCompletionDataCollection data, XmlQualifiedName group, string prefix)
         {
             foreach (XmlSchemaElement element in schema.Elements.Values)
             {
@@ -1582,7 +1580,7 @@
         /// <summary>
         /// Looks for the substitution group element of the specified name.
         /// </summary>
-        XmlSchemaElement FindSubstitutionGroupElement(XmlQualifiedName group, QualifiedName name)
+        private XmlSchemaElement FindSubstitutionGroupElement(XmlQualifiedName group, QualifiedName name)
         {
             XmlSchemaElement matchedElement = null;
 
@@ -1604,4 +1602,4 @@
             return matchedElement;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlSchemaCompletionDataCollection.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlSchemaCompletionDataCollection.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlSchemaCompletionDataCollection.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -17,21 +18,22 @@
 // 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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 namespace Maestro.Editors.Generic.XmlEditor.AutoCompletion
@@ -42,7 +44,6 @@
     [Serializable()]
     internal class XmlSchemaCompletionDataCollection : System.Collections.CollectionBase
     {
-
         /// <summary>
         ///   Initializes a new instance of <see cref='XmlSchemaCompletionDataCollection'/>.
         /// </summary>
@@ -117,7 +118,7 @@
         }
 
         /// <summary>
-        ///   Adds a <see cref='XmlSchemaCompletionData'/> with the specified value to the 
+        ///   Adds a <see cref='XmlSchemaCompletionData'/> with the specified value to the
         ///   <see cref='XmlSchemaCompletionDataCollection'/>.
         /// </summary>
         /// <param name='val'>The <see cref='XmlSchemaCompletionData'/> to add.</param>
@@ -158,12 +159,12 @@
         }
 
         /// <summary>
-        ///   Gets a value indicating whether the 
+        ///   Gets a value indicating whether the
         ///    <see cref='XmlSchemaCompletionDataCollection'/> contains the specified <see cref='XmlSchemaCompletionData'/>.
         /// </summary>
         /// <param name='val'>The <see cref='XmlSchemaCompletionData'/> to locate.</param>
         /// <returns>
-        /// <see langword='true'/> if the <see cref='XmlSchemaCompletionData'/> is contained in the collection; 
+        /// <see langword='true'/> if the <see cref='XmlSchemaCompletionData'/> is contained in the collection;
         ///   otherwise, <see langword='false'/>.
         /// </returns>
         /// <seealso cref='XmlSchemaCompletionDataCollection.IndexOf'/>
@@ -173,7 +174,7 @@
         }
 
         /// <summary>
-        ///   Copies the <see cref='XmlSchemaCompletionDataCollection'/> values to a one-dimensional <see cref='Array'/> instance at the 
+        ///   Copies the <see cref='XmlSchemaCompletionDataCollection'/> values to a one-dimensional <see cref='Array'/> instance at the
         ///    specified index.
         /// </summary>
         /// <param name='array'>The one-dimensional <see cref='Array'/> that is the destination of the values copied from <see cref='XmlSchemaCompletionDataCollection'/>.</param>
@@ -194,12 +195,12 @@
         }
 
         /// <summary>
-        ///    Returns the index of a <see cref='XmlSchemaCompletionData'/> in 
+        ///    Returns the index of a <see cref='XmlSchemaCompletionData'/> in
         ///       the <see cref='XmlSchemaCompletionDataCollection'/>.
         /// </summary>
         /// <param name='val'>The <see cref='XmlSchemaCompletionData'/> to locate.</param>
         /// <returns>
-        ///   The index of the <see cref='XmlSchemaCompletionData'/> of <paramref name='val'/> in the 
+        ///   The index of the <see cref='XmlSchemaCompletionData'/> of <paramref name='val'/> in the
         ///   <see cref='XmlSchemaCompletionDataCollection'/>, if found; otherwise, -1.
         /// </returns>
         /// <seealso cref='XmlSchemaCompletionDataCollection.Contains'/>
@@ -253,7 +254,7 @@
             return null;
         }
 
-        static string NormalizePath(string fileName)
+        private static string NormalizePath(string fileName)
         {
             if (string.IsNullOrEmpty(fileName)) return fileName;
 
@@ -300,6 +301,7 @@
                                 result.Append(outputSeparator);
                             }
                             break;
+
                         case 1:
                             // ignore /./ segment, but append other one-letter segments
                             if (fileName[segmentStartPos] != '.')
@@ -308,6 +310,7 @@
                                 result.Append(fileName[segmentStartPos]);
                             }
                             break;
+
                         case 2:
                             if (fileName[segmentStartPos] == '.' && fileName[segmentStartPos + 1] == '.')
                             {
@@ -361,8 +364,8 @@
         /// <seealso cref='XmlSchemaCompletionData'/>
         public class XmlSchemaCompletionDataEnumerator : System.Collections.IEnumerator
         {
-            System.Collections.IEnumerator baseEnumerator;
-            System.Collections.IEnumerable temp;
+            private System.Collections.IEnumerator baseEnumerator;
+            private System.Collections.IEnumerable temp;
 
             /// <summary>
             ///   Initializes a new instance of <see cref='XmlSchemaCompletionDataEnumerator'/>.
@@ -409,7 +412,7 @@
             }
         }
 
-        XmlSchemaCompletionData GetItem(string namespaceUri)
+        private XmlSchemaCompletionData GetItem(string namespaceUri)
         {
             XmlSchemaCompletionData matchedItem = null;
 
@@ -425,4 +428,4 @@
             return matchedItem;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlSchemaManager.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlSchemaManager.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlSchemaManager.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -17,23 +18,22 @@
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
-using System.Text;
 
 namespace Maestro.Editors.Generic.XmlEditor.AutoCompletion
 {
@@ -45,14 +45,14 @@
     {
         public const string XmlSchemaNamespace = "http://www.w3.org/2001/XMLSchema";
 
-        static XmlSchemaCompletionDataCollection schemas = null;
-        static XmlSchemaManager manager = null;
+        private static XmlSchemaCompletionDataCollection schemas = null;
+        private static XmlSchemaManager manager = null;
 
         public static event EventHandler UserSchemaAdded;
 
         public static event EventHandler UserSchemaRemoved;
 
-        XmlSchemaManager()
+        private XmlSchemaManager()
         {
         }
 
@@ -136,28 +136,28 @@
         /// extension in tools->options.</para>
         /// <para>The normal way of doing things is to
         /// pass the GetProperty method a default value which auto-magically
-        /// turns the xml element into a schema association so we would not 
+        /// turns the xml element into a schema association so we would not
         /// have to check for both.  In this case, however, I do not want
         /// a default saved to the SharpDevelopProperties.xml file unless the user
         /// makes a change using Tools->Options.</para>
-        /// <para>If we have a file extension that is currently missing a default 
-        /// schema then if we  ship the schema at a later date the association will 
-        /// be updated by the code if the user has not changed the settings themselves. 
+        /// <para>If we have a file extension that is currently missing a default
+        /// schema then if we  ship the schema at a later date the association will
+        /// be updated by the code if the user has not changed the settings themselves.
         /// </para>
         /// <para>For example, the initial release of the xml editor add-in had
         /// no default schema for .xsl files, by default it was associated with
         /// no schema and this setting is saved if the user ever viewed the settings
         /// in the tools->options dialog.  Now, after the initial release the
         /// .xsl schema was created and shipped with SharpDevelop, there is
-        /// no way to associate this schema to .xsl files by default since 
+        /// no way to associate this schema to .xsl files by default since
         /// the property exists in the SharpDevelopProperties.xml file.</para>
         /// <para>An alternative way of doing this might be to have the
-        /// config info in the schema itself, which a special SharpDevelop 
+        /// config info in the schema itself, which a special SharpDevelop
         /// namespace.  I believe this is what Visual Studio does.  This
         /// way is not as flexible since it requires the user to locate
         /// the schema and change the association manually.</para>
         /// </remarks>
-        static XmlSchemaAssociation GetSchemaAssociation(string extension)
+        private static XmlSchemaAssociation GetSchemaAssociation(string extension)
         {
             extension = extension.ToLower();
             return XmlSchemaAssociation.GetDefaultAssociation(extension);
@@ -190,7 +190,6 @@
         {
             if (SchemaCompletionDataItems[schemaData.NamespaceUri] == null)
             {
-
                 if (!Directory.Exists(UserSchemaFolder))
                 {
                     Directory.CreateDirectory(UserSchemaFolder);
@@ -208,7 +207,7 @@
                 Debug.WriteLine("Trying to add a schema that already exists.  Namespace=" + schemaData.NamespaceUri);
             }
         }
-        
+
         /// <summary>
         /// Reads the system and user added schemas.
         /// </summary>
@@ -299,7 +298,7 @@
         /// <summary>
         /// Should really pass schema info with the event.
         /// </summary>
-        static void OnUserSchemaAdded()
+        private static void OnUserSchemaAdded()
         {
             if (UserSchemaAdded != null)
             {
@@ -310,7 +309,7 @@
         /// <summary>
         /// Should really pass schema info with the event.
         /// </summary>
-        static void OnUserSchemaRemoved()
+        private static void OnUserSchemaRemoved()
         {
             if (UserSchemaRemoved != null)
             {
@@ -318,4 +317,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/FindAndReplaceForm.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.TextEditor;
+using ICSharpCode.TextEditor.Document;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
+using System.Diagnostics;
 using System.Drawing;
-using System.Text;
+using System.IO;
 using System.Windows.Forms;
-using ICSharpCode.TextEditor.Document;
-using ICSharpCode.TextEditor;
-using System.Diagnostics;
-using System.IO;
 
 namespace Maestro.Editors.Generic.XmlEditor
 {
@@ -43,11 +43,14 @@
             _search = new TextEditorSearcher();
         }
 
-        TextEditorSearcher _search;
-        TextEditorControl _editor;
-        TextEditorControl Editor { 
-            get { return _editor; } 
-            set { 
+        private TextEditorSearcher _search;
+        private TextEditorControl _editor;
+
+        private TextEditorControl Editor
+        {
+            get { return _editor; }
+            set
+            {
                 _editor = value;
                 _search.Document = _editor.Document;
                 UpdateTitleBar();
@@ -70,27 +73,30 @@
 
             _search.ClearScanRegion();
             var sm = editor.ActiveTextAreaControl.SelectionManager;
-            if (sm.HasSomethingSelected && sm.SelectionCollection.Count == 1) {
+            if (sm.HasSomethingSelected && sm.SelectionCollection.Count == 1)
+            {
                 var sel = sm.SelectionCollection[0];
                 if (sel.StartPosition.Line == sel.EndPosition.Line)
                     txtLookFor.Text = sm.SelectedText;
                 else
                     _search.SetScanRegion(sel);
-            } else {
+            }
+            else
+            {
                 // Get the current word that the caret is on
                 Caret caret = editor.ActiveTextAreaControl.Caret;
                 int start = TextUtilities.FindWordStart(editor.Document, caret.Offset);
                 int endAt = TextUtilities.FindWordEnd(editor.Document, caret.Offset);
                 txtLookFor.Text = editor.Document.GetText(start, endAt - start);
             }
-            
+
             ReplaceMode = replaceMode;
 
             if (show)
             {
                 this.Owner = (Form)editor.TopLevelControl;
                 this.Show();
-            
+
                 txtLookFor.SelectAll();
                 txtLookFor.Focus();
             }
@@ -104,7 +110,8 @@
         public bool ReplaceMode
         {
             get { return txtReplaceWith.Visible; }
-            set {
+            set
+            {
                 btnReplace.Visible = btnReplaceAll.Visible = value;
                 lblReplaceWith.Visible = txtReplaceWith.Visible = value;
                 btnHighlightAll.Visible = !value;
@@ -117,6 +124,7 @@
         {
             FindNext(txtLookFor.Text, false, true, Strings.TextNotFound);
         }
+
         private void btnFindNext_Click(object sender, EventArgs e)
         {
             FindNext(txtLookFor.Text, false, false, Strings.TextNotFound);
@@ -145,7 +153,8 @@
 
             var caret = _editor.ActiveTextAreaControl.Caret;
             if (viaF3 && _search.HasScanRegion && !caret.Offset.
-                IsInRange(_search.BeginOffset, _search.EndOffset)) {
+                IsInRange(_search.BeginOffset, _search.EndOffset))
+            {
                 // user moved outside of the originally selected region
                 _search.ClearScanRegion();
                 UpdateTitleBar();
@@ -166,13 +175,13 @@
             TextLocation p2 = _editor.Document.OffsetToPosition(range.Offset + range.Length);
             _editor.ActiveTextAreaControl.SelectionManager.SetSelection(p1, p2);
             _editor.ActiveTextAreaControl.ScrollTo(p1.Line, p1.Column);
-            // Also move the caret to the end of the selection, because when the user 
+            // Also move the caret to the end of the selection, because when the user
             // presses F3, the caret is where we start searching next time.
-            _editor.ActiveTextAreaControl.Caret.Position = 
+            _editor.ActiveTextAreaControl.Caret.Position =
                 _editor.Document.OffsetToPosition(range.Offset + range.Length);
         }
 
-        Dictionary<TextEditorControl, HighlightGroup> _highlightGroups = new Dictionary<TextEditorControl, HighlightGroup>();
+        private Dictionary<TextEditorControl, HighlightGroup> _highlightGroups = new Dictionary<TextEditorControl, HighlightGroup>();
 
         private void btnHighlightAll_Click(object sender, EventArgs e)
         {
@@ -183,21 +192,23 @@
             if (string.IsNullOrEmpty(LookFor))
                 // Clear highlights
                 group.ClearMarkers();
-            else {
+            else
+            {
                 _search.LookFor = txtLookFor.Text;
                 _search.MatchCase = chkMatchCase.Checked;
                 _search.MatchWholeWordOnly = chkMatchWholeWord.Checked;
 
                 bool looped = false;
                 int offset = 0, count = 0;
-                for(;;) {
+                for (; ; )
+                {
                     TextRange range = _search.FindNext(offset, false, out looped);
                     if (range == null || looped)
                         break;
                     offset = range.Offset + range.Length;
                     count++;
 
-                    var m = new TextMarker(range.Offset, range.Length, 
+                    var m = new TextMarker(range.Offset, range.Length,
                             TextMarkerType.SolidBlock, Color.Yellow, Color.Black);
                     group.AddMarker(m);
                 }
@@ -207,17 +218,17 @@
                     Close();
             }
         }
-        
+
         private void FindAndReplaceForm_FormClosing(object sender, FormClosingEventArgs e)
         {	// Prevent dispose, as this form can be re-used
             if (e.CloseReason != CloseReason.FormOwnerClosing)
             {
                 if (this.Owner != null)
                     this.Owner.Select(); // prevent another app from being activated instead
-                
+
                 e.Cancel = true;
                 Hide();
-                
+
                 // Discard search region
                 _search.ClearScanRegion();
                 _editor.Refresh(); // must repaint manually
@@ -242,7 +253,7 @@
             int count = 0;
             // BUG FIX: if the replacement string contains the original search string
             // (e.g. replace "red" with "very red") we must avoid looping around and
-            // replacing forever! To fix, start replacing at beginning of region (by 
+            // replacing forever! To fix, start replacing at beginning of region (by
             // moving the caret) and stop as soon as we loop around.
             _editor.ActiveTextAreaControl.Caret.Position =
                 _editor.Document.OffsetToPosition(_search.BeginOffset);
@@ -272,7 +283,8 @@
             int count = FindAndReplace(txtLookFor.Text, txtReplaceWith.Text);
             if (count == 0)
                 MessageBox.Show(Strings.TextNoOccurrencesFound);
-            else {
+            else
+            {
                 MessageBox.Show(string.Format(Strings.TextOccurrencesReplaced, count));
                 Close();
             }
@@ -282,13 +294,17 @@
         {
             var textArea = _editor.ActiveTextAreaControl.TextArea;
             textArea.Document.UndoStack.StartUndoGroup();
-            try {
-                if (textArea.SelectionManager.HasSomethingSelected) {
+            try
+            {
+                if (textArea.SelectionManager.HasSomethingSelected)
+                {
                     textArea.Caret.Position = textArea.SelectionManager.SelectionCollection[0].StartPosition;
                     textArea.SelectionManager.RemoveSelectedText();
                 }
                 textArea.InsertString(text);
-            } finally {
+            }
+            finally
+            {
                 textArea.Document.UndoStack.EndUndoGroup();
             }
         }
@@ -303,10 +319,12 @@
             Debug.Assert(lo <= hi);
             return x < lo ? lo : (x > hi ? hi : x);
         }
+
         public static bool IsInRange(this int x, int lo, int hi)
         {
             return x >= lo && x <= hi;
         }
+
         public static Color HalfMix(this Color one, Color two)
         {
             return Color.FromArgb(
@@ -319,7 +337,8 @@
 
     internal class TextRange : AbstractSegment
     {
-        IDocument _document;
+        private IDocument _document;
+
         public TextRange(IDocument document, int offset, int length)
         {
             _document = document;
@@ -328,51 +347,58 @@
         }
     }
 
-    /// <summary>This class finds occurrances of a search string in a text 
+    /// <summary>This class finds occurrances of a search string in a text
     /// editor's IDocument... it's like Find box without a GUI.</summary>
     internal class TextEditorSearcher : IDisposable
     {
-        IDocument _document;
+        private IDocument _document;
+
         public IDocument Document
         {
-            get { return _document; } 
-            set { 
-                if (_document != value) {
+            get { return _document; }
+            set
+            {
+                if (_document != value)
+                {
                     ClearScanRegion();
                     _document = value;
                 }
             }
         }
 
-        // I would have used the TextAnchor class to represent the beginning and 
-        // end of the region to scan while automatically adjusting to changes in 
-        // the document--but for some reason it is sealed and its constructor is 
-        // internal. Instead I use a TextMarker, which is perhaps even better as 
-        // it gives me the opportunity to highlight the region. Note that all the 
-        // markers and coloring information is associated with the text document, 
-        // not the editor control, so TextEditorSearcher doesn't need a reference 
+        // I would have used the TextAnchor class to represent the beginning and
+        // end of the region to scan while automatically adjusting to changes in
+        // the document--but for some reason it is sealed and its constructor is
+        // internal. Instead I use a TextMarker, which is perhaps even better as
+        // it gives me the opportunity to highlight the region. Note that all the
+        // markers and coloring information is associated with the text document,
+        // not the editor control, so TextEditorSearcher doesn't need a reference
         // to the TextEditorControl. After adding the marker to the document, we
         // must remember to remove it when it is no longer needed.
-        TextMarker _region = null;
-        /// <summary>Sets the region to search. The region is updated 
+        private TextMarker _region = null;
+
+        /// <summary>Sets the region to search. The region is updated
         /// automatically as the document changes.</summary>
         public void SetScanRegion(ISelection sel)
         {
             SetScanRegion(sel.Offset, sel.Length);
         }
-        /// <summary>Sets the region to search. The region is updated 
+
+        /// <summary>Sets the region to search. The region is updated
         /// automatically as the document changes.</summary>
         public void SetScanRegion(int offset, int length)
         {
             var bkgColor = _document.HighlightingStrategy.GetColorFor("Default").BackgroundColor; //NOXLATE
-            _region = new TextMarker(offset, length, TextMarkerType.SolidBlock, 
-                bkgColor.HalfMix(Color.FromArgb(160,160,160)));
+            _region = new TextMarker(offset, length, TextMarkerType.SolidBlock,
+                bkgColor.HalfMix(Color.FromArgb(160, 160, 160)));
             _document.MarkerStrategy.AddMarker(_region);
         }
+
         public bool HasScanRegion
         {
             get { return _region != null; }
         }
+
         public void ClearScanRegion()
         {
             if (_region != null)
@@ -381,23 +407,34 @@
                 _region = null;
             }
         }
-        public void Dispose() { ClearScanRegion(); GC.SuppressFinalize(this); }
-        ~TextEditorSearcher() { Dispose(); }
-        
+
+        public void Dispose()
+        {
+            ClearScanRegion(); GC.SuppressFinalize(this);
+        }
+
+        ~TextEditorSearcher()
+        {
+            Dispose();
+        }
+
         /// <summary>Begins the start offset for searching</summary>
         public int BeginOffset
         {
-            get {
+            get
+            {
                 if (_region != null)
                     return _region.Offset;
                 else
                     return 0;
             }
         }
+
         /// <summary>Begins the end offset for searching</summary>
         public int EndOffset
         {
-            get {
+            get
+            {
                 if (_region != null)
                     return _region.EndOffset;
                 else
@@ -409,15 +446,16 @@
 
         public bool MatchWholeWordOnly;
 
-        string _lookFor;
-        string _lookFor2; // uppercase in case-insensitive mode
+        private string _lookFor;
+        private string _lookFor2; // uppercase in case-insensitive mode
+
         public string LookFor
         {
             get { return _lookFor; }
             set { _lookFor = value; }
         }
 
-        /// <summary>Finds next instance of LookFor, according to the search rules 
+        /// <summary>Finds next instance of LookFor, according to the search rules
         /// (MatchCase, MatchWholeWordOnly).</summary>
         /// <param name="beginAtOffset">Offset in Document at which to begin the search</param>
         /// <param name="searchBackward"></param>
@@ -433,17 +471,22 @@
             int curOffs = beginAtOffset.InRange(startAt, endAt);
 
             _lookFor2 = MatchCase ? _lookFor : _lookFor.ToUpperInvariant();
-            
+
             TextRange result;
-            if (searchBackward) {
+            if (searchBackward)
+            {
                 result = FindNextIn(startAt, curOffs, true);
-                if (result == null) {
+                if (result == null)
+                {
                     loopedAround = true;
                     result = FindNextIn(curOffs, endAt, true);
                 }
-            } else {
+            }
+            else
+            {
                 result = FindNextIn(curOffs, endAt, false);
-                if (result == null) {
+                if (result == null)
+                {
                     loopedAround = true;
                     result = FindNextIn(startAt, curOffs, false);
                 }
@@ -472,13 +515,17 @@
             char lookForCh = _lookFor2[0];
             if (searchBackward)
             {
-                for (int offset = offset2; offset >= offset1; offset--) {
+                for (int offset = offset2; offset >= offset1; offset--)
+                {
                     if (matchFirstCh(lookForCh, _document.GetCharAt(offset))
                         && matchWord(offset))
                         return new TextRange(_document, offset, _lookFor.Length);
                 }
-            } else {
-                for (int offset = offset1; offset <= offset2; offset++) {
+            }
+            else
+            {
+                for (int offset = offset1; offset <= offset2; offset++)
+                {
                     if (matchFirstCh(lookForCh, _document.GetCharAt(offset))
                         && matchWord(offset))
                         return new TextRange(_document, offset, _lookFor.Length);
@@ -486,6 +533,7 @@
             }
             return null;
         }
+
         private bool IsWholeWordMatch(int offset)
         {
             if (IsWordBoundary(offset) && IsWordBoundary(offset + _lookFor.Length))
@@ -493,16 +541,19 @@
             else
                 return false;
         }
+
         private bool IsWordBoundary(int offset)
         {
             return offset <= 0 || offset >= _document.TextLength ||
                 !IsAlphaNumeric(offset - 1) || !IsAlphaNumeric(offset);
         }
+
         private bool IsAlphaNumeric(int offset)
         {
             char c = _document.GetCharAt(offset);
             return Char.IsLetterOrDigit(c) || c == '_'; //NOXLATE
         }
+
         private bool IsPartWordMatch(int offset)
         {
             string substr = _document.GetText(offset, _lookFor.Length);
@@ -512,23 +563,26 @@
         }
     }
 
-    /// <summary>Bundles a group of markers together so that they can be cleared 
+    /// <summary>Bundles a group of markers together so that they can be cleared
     /// together.</summary>
     internal class HighlightGroup : IDisposable
     {
-        List<TextMarker> _markers = new List<TextMarker>();
-        TextEditorControl _editor;
-        IDocument _document;
+        private List<TextMarker> _markers = new List<TextMarker>();
+        private TextEditorControl _editor;
+        private IDocument _document;
+
         public HighlightGroup(TextEditorControl editor)
         {
             _editor = editor;
             _document = editor.Document;
         }
+
         public void AddMarker(TextMarker marker)
         {
             _markers.Add(marker);
             _document.MarkerStrategy.AddMarker(marker);
         }
+
         public void ClearMarkers()
         {
             foreach (TextMarker m in _markers)
@@ -536,9 +590,17 @@
             _markers.Clear();
             _editor.Refresh();
         }
-        public void Dispose() { ClearMarkers(); GC.SuppressFinalize(this); }
-        ~HighlightGroup() { Dispose(); }
 
+        public void Dispose()
+        {
+            ClearMarkers(); GC.SuppressFinalize(this);
+        }
+
+        ~HighlightGroup()
+        {
+            Dispose();
+        }
+
         public IList<TextMarker> Markers { get { return _markers.AsReadOnly(); } }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/XmlEditorOptions.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/XmlEditorOptions.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/XmlEditorOptions.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -13,27 +14,24 @@
 //  email: office at alphasierrapapa.com
 //  court of jurisdiction: Landesgericht Leoben
 //
-// 
+//
 // 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
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace Maestro.Editors.Generic.XmlEditor
 {
     /// <summary>
@@ -54,4 +52,4 @@
         /// </summary>
         public static bool ShowAttributesWhenFolded { get; set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/XmlFoldingStrategy.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/XmlFoldingStrategy.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/XmlFoldingStrategy.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -13,28 +14,29 @@
 //  email: office at alphasierrapapa.com
 //  court of jurisdiction: Landesgericht Leoben
 //
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.TextEditor.Document;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Xml;
 
@@ -45,11 +47,11 @@
     /// </summary>
     public class XmlFoldStart
     {
-        int line = 0;
-        int col = 0;
-        string prefix = String.Empty;
-        string name = String.Empty;
-        string foldText = String.Empty;
+        private int line = 0;
+        private int col = 0;
+        private string prefix = String.Empty;
+        private string name = String.Empty;
+        private string foldText = String.Empty;
 
         /// <summary>
         /// Initializes a new instance of the XmlFoldStart class
@@ -132,7 +134,7 @@
         /// Flag indicating whether attributes should be displayed on folded
         /// elements.
         /// </summary>
-        bool showAttributesWhenFolded = false;
+        private bool showAttributesWhenFolded = false;
 
         /// <summary>
         /// Initializes a new instance of the XmlFoldingStrategy class
@@ -147,8 +149,8 @@
         /// Adds folds to the text editor around each start-end element pair.
         /// </summary>
         /// <remarks>
-        /// <para>If the xml is not well formed then no folds are created.</para> 
-        /// <para>Note that the xml text reader lines and positions start 
+        /// <para>If the xml is not well formed then no folds are created.</para>
+        /// <para>Note that the xml text reader lines and positions start
         /// from 1 and the SharpDevelop text editor line information starts
         /// from 0.</para>
         /// </remarks>
@@ -188,7 +190,7 @@
             }
             catch (Exception)
             {
-                // If the xml is not well formed keep the foldings 
+                // If the xml is not well formed keep the foldings
                 // that already exist in the document.
                 return new List<FoldMarker>(document.FoldingManager.FoldMarker);
             }
@@ -196,14 +198,14 @@
             return foldMarkers;
         }
 
-        #endregion
+        #endregion IFoldingStrategy
 
         /// <summary>
         /// Creates a comment fold if the comment spans more than one line.
         /// </summary>
-        /// <remarks>The text displayed when the comment is folded is the first 
+        /// <remarks>The text displayed when the comment is folded is the first
         /// line of the comment.</remarks>
-        void CreateCommentFold(IDocument document, List<FoldMarker> foldMarkers, XmlTextReader reader)
+        private void CreateCommentFold(IDocument document, List<FoldMarker> foldMarkers, XmlTextReader reader)
         {
             if (reader.Value != null)
             {
@@ -211,7 +213,6 @@
                 string[] lines = comment.Split('\n');
                 if (lines.Length > 1)
                 {
-
                     // Take off 5 chars to get the actual comment start (takes
                     // into account the <!-- chars.
 
@@ -231,11 +232,11 @@
         /// <summary>
         /// Creates an XmlFoldStart for the start tag of an element.
         /// </summary>
-        XmlFoldStart CreateElementFoldStart(XmlTextReader reader)
+        private XmlFoldStart CreateElementFoldStart(XmlTextReader reader)
         {
-            // Take off 2 from the line position returned 
+            // Take off 2 from the line position returned
             // from the xml since it points to the start
-            // of the element name and not the beginning 
+            // of the element name and not the beginning
             // tag.
             XmlFoldStart newFoldStart = new XmlFoldStart(reader.Prefix, reader.LocalName, reader.LineNumber - 1, reader.LinePosition - 2);
 
@@ -252,10 +253,10 @@
         }
 
         /// <summary>
-        /// Create an element fold if the start and end tag are on 
+        /// Create an element fold if the start and end tag are on
         /// different lines.
         /// </summary>
-        void CreateElementFold(IDocument document, List<FoldMarker> foldMarkers, XmlTextReader reader, XmlFoldStart foldStart)
+        private void CreateElementFold(IDocument document, List<FoldMarker> foldMarkers, XmlTextReader reader, XmlFoldStart foldStart)
         {
             int endLine = reader.LineNumber - 1;
             if (endLine > foldStart.Line)
@@ -275,7 +276,7 @@
         /// line of the start tag.  It does not cater for elements where attributes
         /// are not on the same line as the start tag.
         /// </remarks>
-        string GetAttributeFoldText(XmlTextReader reader)
+        private string GetAttributeFoldText(XmlTextReader reader)
         {
             StringBuilder text = new StringBuilder();
 
@@ -305,7 +306,7 @@
         /// the XmlTextReader is the plain unencoded string and .NET
         /// does not provide us with an xml encode method.
         /// </summary>
-        static string XmlEncodeAttributeValue(string attributeValue, char quoteChar)
+        private static string XmlEncodeAttributeValue(string attributeValue, char quoteChar)
         {
             StringBuilder encodedValue = new StringBuilder(attributeValue);
 
@@ -325,4 +326,4 @@
             return encodedValue.ToString();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/XmlFormattingStrategy.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/XmlFormattingStrategy.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/XmlFormattingStrategy.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,8 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, Jackie Ng
 // http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
-// 
+//
 // Original code from SharpDevelop 3.2.1 licensed under the same terms (LGPL 2.1)
 // Copyright 2002-2010 by
 //
@@ -13,31 +14,31 @@
 //  email: office at alphasierrapapa.com
 //  court of jurisdiction: Landesgericht Leoben
 //
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.TextEditor;
 using ICSharpCode.TextEditor.Actions;
 using ICSharpCode.TextEditor.Document;
 using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Xml;
 
@@ -151,6 +152,7 @@
         }
 
         #region Smart Indentation
+
         private void TryIndent(TextArea textArea, int begin, int end)
         {
             string currentIndentation = "";
@@ -249,6 +251,7 @@
                 r.Close();
             }
         }
-        #endregion
+
+        #endregion Smart Indentation
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,45 +1,39 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.TextEditor.Actions;
+using ICSharpCode.TextEditor.Document;
+using OSGeo.MapGuide.MaestroAPI;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
 using System.IO;
-using System.Text;
 using System.Windows.Forms;
 using System.Xml;
-using System.Xml.Schema;
 
-using ICSharpCode.TextEditor.Document;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.ObjectModels;
-using ICSharpCode.TextEditor.Actions;
-using Maestro.Editors.Generic.XmlEditor;
-
 namespace Maestro.Editors.Generic
 {
     /// <summary>
-    /// 
+    ///
     /// </summary>
     public delegate void XmlValidationCallback(out string[] errors, out string[] warnings);
 
@@ -51,7 +45,7 @@
     /// </summary>
     public partial class XmlEditorCtrl : EditorBase, INotifyResourceChanged
     {
-        class FindAction : AbstractEditAction
+        private class FindAction : AbstractEditAction
         {
             private XmlEditorCtrl _parent;
 
@@ -66,11 +60,14 @@
             }
         }
 
-        class FindAndReplaceAction : AbstractEditAction
+        private class FindAndReplaceAction : AbstractEditAction
         {
             private XmlEditorCtrl _parent;
 
-            public FindAndReplaceAction(XmlEditorCtrl parent) { _parent = parent; }
+            public FindAndReplaceAction(XmlEditorCtrl parent)
+            {
+                _parent = parent;
+            }
 
             public override void Execute(ICSharpCode.TextEditor.TextArea textArea)
             {
@@ -110,9 +107,9 @@
                 txtXmlContent.DefaultSchemaCompletionData = new XmlEditor.AutoCompletion.XmlSchemaCompletionData(xsdPath);
             }
         }
-        
+
         private string _origText;
-        
+
         private void OnTextContentChanged(object sender, EventArgs e)
         {
             if (!string.IsNullOrEmpty(_origText) && !txtXmlContent.Text.Equals(_origText))
@@ -120,7 +117,7 @@
                 OnResourceChanged();
                 EvaluateCommands();
             }
-                
+
             if (string.IsNullOrEmpty(_origText))
                 _origText = txtXmlContent.Text;
         }
@@ -203,9 +200,9 @@
         public string XmlContent
         {
             get { return txtXmlContent.Text; }
-            set 
+            set
             {
-                _origText = null;            
+                _origText = null;
                 txtXmlContent.Text = value;
                 FormatText();
             }
@@ -234,7 +231,7 @@
             UpdateTextPosition();
             EvaluateCommands();
             txtXmlContent.UpdateFolding();
-            if (_ready) 
+            if (_ready)
                 OnResourceChanged();
         }
 
@@ -420,8 +417,8 @@
 
         /// <summary>
         /// Gets or sets whether this editor can support reloading XML content
-        /// from a source resource. If true, subscribe to the 
-        /// <see cref="E:Maestro.Editors.Generic.XmlEditorCtrl.RequestReloadFromSource"/> 
+        /// from a source resource. If true, subscribe to the
+        /// <see cref="E:Maestro.Editors.Generic.XmlEditorCtrl.RequestReloadFromSource"/>
         /// event to handle this particular action
         /// </summary>
         public bool SupportsReReadFromSource
@@ -444,18 +441,18 @@
                 h(this, EventArgs.Empty);
         }
     }
-    
+
     /// <summary>
     /// Holds information about the start of a fold in an xml string.
     /// </summary>
     internal class XmlFoldStart
     {
-        int line = 0;
-        int col = 0;
-        string prefix = String.Empty;
-        string name = String.Empty;
-        string foldText = String.Empty;
-        
+        private int line = 0;
+        private int col = 0;
+        private string prefix = String.Empty;
+        private string name = String.Empty;
+        private string foldText = String.Empty;
+
         public XmlFoldStart(string prefix, string name, int line, int col)
         {
             this.line = line;
@@ -463,49 +460,61 @@
             this.prefix = prefix;
             this.name = name;
         }
-        
+
         /// <summary>
         /// The line where the fold should start.  Lines start from 0.
         /// </summary>
-        public int Line {
-            get {
+        public int Line
+        {
+            get
+            {
                 return line;
             }
         }
-        
+
         /// <summary>
         /// The column where the fold should start.  Columns start from 0.
         /// </summary>
-        public int Column {
-            get {
+        public int Column
+        {
+            get
+            {
                 return col;
             }
-        }	
-        
+        }
+
         /// <summary>
         /// The name of the xml item with its prefix if it has one.
         /// </summary>
-        public string Name {
-            get {
-                if (prefix.Length > 0) {
+        public string Name
+        {
+            get
+            {
+                if (prefix.Length > 0)
+                {
                     return String.Concat(prefix, ":", name); //NOXLATE
-                } else {
+                }
+                else
+                {
                     return name;
                 }
             }
         }
-        
+
         /// <summary>
         /// The text to be displayed when the item is folded.
         /// </summary>
-        public string FoldText {
-            get {
+        public string FoldText
+        {
+            get
+            {
                 return foldText;
             }
-            
-            set {
+
+            set
+            {
                 foldText = value;
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using Maestro.Editors.Generic;
 using System.IO;
-using OSGeo.MapGuide.MaestroAPI;
-using System.Xml;
-using Maestro.Editors;
+using System.Windows.Forms;
 using System.Xml.Schema;
 
 #pragma warning disable 1591
@@ -72,7 +67,7 @@
             this.Disposed += new EventHandler(OnDisposed);
         }
 
-        void OnDisposed(object sender, EventArgs e)
+        private void OnDisposed(object sender, EventArgs e)
         {
             //Same as EditorBindableCollapsiblePanel.UnsubscribeEventHandlers()
             var handler = this.ResourceChanged;

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorSettings.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorSettings.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorSettings.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,25 @@
 #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
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace Maestro.Editors.Generic
 {
     /// <summary>
@@ -34,4 +32,4 @@
         /// </summary>
         public static string XsdPath { get; set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlTextEditorControl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlTextEditorControl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlTextEditorControl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,36 +1,37 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using ICSharpCode.TextEditor;
 using ICSharpCode.TextEditor.Actions;
-using System.Windows.Forms;
-using System.ComponentModel;
 using ICSharpCode.TextEditor.Document;
-using Maestro.Shared.UI;
 using ICSharpCode.TextEditor.Gui.CompletionWindow;
 using Maestro.Editors.Generic.XmlEditor;
+using Maestro.Editors.Generic.XmlEditor.AutoCompletion;
+using Maestro.Shared.UI;
+using System;
+using System.ComponentModel;
 using System.Drawing;
-using Maestro.Editors.Generic.XmlEditor.AutoCompletion;
+using System.Text;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.Generic
 {
@@ -79,7 +80,7 @@
         /// </summary>
         internal void RefreshMargin()
         {
-            Action action = () => 
+            Action action = () =>
             {
                 this.ActiveTextAreaControl.TextArea.Refresh(this.ActiveTextAreaControl.TextArea.FoldMargin);
             };
@@ -92,7 +93,7 @@
         #region XML auto-completion stuff
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="newControl"></param>
         protected override void InitializeTextAreaControl(TextAreaControl newControl)
@@ -113,9 +114,9 @@
              */
         }
 
-        CodeCompletionWindow codeCompletionWindow;
-        XmlSchemaCompletionDataCollection schemaCompletionDataItems = new XmlSchemaCompletionDataCollection();
-        XmlSchemaCompletionData defaultSchemaCompletionData = null;
+        private CodeCompletionWindow codeCompletionWindow;
+        private XmlSchemaCompletionDataCollection schemaCompletionDataItems = new XmlSchemaCompletionDataCollection();
+        private XmlSchemaCompletionData defaultSchemaCompletionData = null;
 
         /// <summary>
         /// Gets the schemas that the xml editor will use.
@@ -153,7 +154,7 @@
             }
         }
 
-        char GetCharacterBeforeCaret()
+        private char GetCharacterBeforeCaret()
         {
             string text = Document.GetText(ActiveTextAreaControl.TextArea.Caret.Offset - 1, 1);
             if (text.Length > 0)
@@ -164,7 +165,7 @@
             return '\0';
         }
 
-        bool IsCaretAtDocumentStart
+        private bool IsCaretAtDocumentStart
         {
             get
             {
@@ -219,6 +220,7 @@
                     case '=':
                         ShowCompletionWindow(ch);
                         return false;
+
                     default:
                         if (XmlParser.IsAttributeValueChar(ch))
                         {
@@ -245,7 +247,7 @@
             return false;
         }
 
-        bool IsCodeCompletionEnabled
+        private bool IsCodeCompletionEnabled
         {
             get
             {
@@ -256,7 +258,7 @@
         /// <summary>
         /// Checks whether the caret is inside a set of quotes (" or ').
         /// </summary>
-        bool IsInsideQuotes(TextArea textArea)
+        private bool IsInsideQuotes(TextArea textArea)
         {
             bool inside = false;
 
@@ -266,7 +268,6 @@
                 if ((line.Offset + line.Length > textArea.Caret.Offset) &&
                     (line.Offset < textArea.Caret.Offset))
                 {
-
                     char charAfter = textArea.Document.GetCharAt(textArea.Caret.Offset);
                     char charBefore = textArea.Document.GetCharAt(textArea.Caret.Offset - 1);
 
@@ -305,7 +306,7 @@
         /// </code>
         /// The Close method is called because the offset is out of the range.
         /// </remarks>
-        void InsertCharacter(char ch)
+        private void InsertCharacter(char ch)
         {
             ActiveTextAreaControl.TextArea.BeginUpdate();
             Document.UndoStack.StartUndoGroup();
@@ -315,6 +316,7 @@
                 case CaretMode.InsertMode:
                     ActiveTextAreaControl.TextArea.InsertChar(ch);
                     break;
+
                 case CaretMode.OverwriteMode:
                     ActiveTextAreaControl.TextArea.ReplaceChar(ch);
                     break;
@@ -326,14 +328,14 @@
             Document.UndoStack.EndUndoGroup();
         }
 
-        void CodeCompletionWindowClosed(object sender, EventArgs e)
+        private void CodeCompletionWindowClosed(object sender, EventArgs e)
         {
             codeCompletionWindow.Closed -= new EventHandler(CodeCompletionWindowClosed);
             codeCompletionWindow.Dispose();
             codeCompletionWindow = null;
         }
 
-        bool IsCodeCompletionWindowOpen
+        private bool IsCodeCompletionWindowOpen
         {
             get
             {
@@ -341,7 +343,7 @@
             }
         }
 
-        void ShowCompletionWindow(char ch)
+        private void ShowCompletionWindow(char ch)
         {
             if (IsCodeCompletionWindowOpen)
             {
@@ -360,7 +362,7 @@
             }
         }
 
-        #endregion
+        #endregion XML auto-completion stuff
     }
 
     internal class TextEditorProperties : ITextEditorProperties
@@ -556,7 +558,7 @@
             return new TextEditorProperties()
             {
                 EnableFolding = true,
-                ShowLineNumbers  = true,
+                ShowLineNumbers = true,
                 ShowHorizontalRuler = false,
                 ShowVerticalRuler = false,
                 ShowSpaces = true,
@@ -576,4 +578,4 @@
             };
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlValidationResult.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlValidationResult.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlValidationResult.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.Generic
@@ -32,9 +32,10 @@
     /// </summary>
     internal partial class XmlValidationResult : Form
     {
-        class MessageItem
+        private class MessageItem
         {
             public Image Icon { get; set; }
+
             public string Message { get; set; }
         }
 
@@ -64,4 +65,4 @@
             this.Close();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/IEditorBindable.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/IEditorBindable.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/IEditorBindable.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace Maestro.Editors
 {
     /// <summary>
@@ -36,4 +35,4 @@
         /// <param name="service"></param>
         void Bind(IEditorService service);
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/IEditorService.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/IEditorService.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/IEditorService.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.MaestroAPI.Services;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI;
 using System.Collections.Specialized;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using System.IO;
-using OSGeo.MapGuide.ObjectModels.Common;
 using System.ComponentModel;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI.Commands;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 
 namespace Maestro.Editors
 {
@@ -41,32 +39,39 @@
         /// Gets the locale for previewing
         /// </summary>
         string PreviewLocale { get; set; }
+
         /// <summary>
         /// Gets the connection instance associated with this editor service
         /// </summary>
         IServerConnection CurrentConnection { get; }
+
         /// <summary>
         /// Gets the session id
         /// </summary>
         string SessionID { get; }
+
         /// <summary>
         /// Gets the suggested save folder for a "save as" operation
         /// </summary>
         string SuggestedSaveFolder { get; set; }
+
         /// <summary>
         /// Registers a custom notifier
         /// </summary>
         /// <param name="irc"></param>
         void RegisterCustomNotifier(INotifyResourceChanged irc);
+
         /// <summary>
         /// Indicates whether an upgrade for this resource is available
         /// </summary>
         bool IsUpgradeAvailable { get; }
+
         /// <summary>
         /// Invokes a prompt to select a resource of any type
         /// </summary>
         /// <returns></returns>
         string SelectAnyResource();
+
         /// <summary>
         /// Invokes a prompt to select a resource of the specified type
         /// </summary>
@@ -251,4 +256,4 @@
         /// <param name="args"></param>
         void RunProcess(string processName, params string[] args);
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LastSelectedFolder.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LastSelectedFolder.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LastSelectedFolder.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Editors
@@ -49,4 +49,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,40 +1,40 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Generic;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using Maestro.Shared.UI;
 using System.Diagnostics;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.LayerDefinition.Drawing
 {
     [ToolboxItem(false)]
-    internal partial class DrawingLayerSettingsCtrl : CollapsiblePanel,IEditorBindable
+    internal partial class DrawingLayerSettingsCtrl : CollapsiblePanel, IEditorBindable
     {
         public DrawingLayerSettingsCtrl()
         {
@@ -65,7 +65,6 @@
             cmbSheet_SelectedIndexChanged(this, EventArgs.Empty);
             ComboBoxBinder.BindSelectedIndexChanged(cmbSheet, "SelectedValue", _dlayer, "Sheet"); //NOXLATE
 
-
             var minBinding = new Binding("Text", _dlayer, "MinScale"); //NOXLATE
             var maxBinding = new Binding("Text", _dlayer, "MaxScale"); //NOXLATE
 
@@ -107,7 +106,7 @@
             _dlayer.PropertyChanged += WeakEventHandler.Wrap<PropertyChangedEventHandler>(OnDrawingLayerPropertyChanged, (eh) => _dlayer.PropertyChanged -= eh);
         }
 
-        void OnDrawingLayerPropertyChanged(object sender, PropertyChangedEventArgs e)
+        private void OnDrawingLayerPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             OnResourceChanged();
         }
@@ -145,7 +144,7 @@
                     chkListDwfLayers.Items.Add(lyr, true);
                 }
             }
-            else 
+            else
             {
                 string[] visible = _dlayer.LayerFilter.Split(','); //NOXLATE
                 foreach (var lyr in layers)
@@ -207,7 +206,7 @@
         private void btnBrowse_Click(object sender, EventArgs e)
         {
             using (var picker = new ResourcePicker(_service.CurrentConnection,
-                                                   OSGeo.MapGuide.MaestroAPI.ResourceTypes.DrawingSource.ToString(), 
+                                                   OSGeo.MapGuide.MaestroAPI.ResourceTypes.DrawingSource.ToString(),
                                                    ResourcePickerMode.OpenResource))
             {
                 if (picker.ShowDialog() == DialogResult.OK)
@@ -224,4 +223,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/DrawingLayerEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/DrawingLayerEditorCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/DrawingLayerEditorCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
 
+#endregion Disclaimer / License
+
 namespace Maestro.Editors.LayerDefinition
 {
     /// <summary>
@@ -51,4 +46,4 @@
             drawingSettingsCtrl.Bind(service);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/LayerEditorSettings.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/LayerEditorSettings.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/LayerEditorSettings.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,25 @@
 #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
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace Maestro.Editors.LayerDefinition
 {
     /// <summary>
@@ -39,4 +37,4 @@
         /// </summary>
         public static bool UseGridEditor { get; set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,17 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using Maestro.Shared.UI;
-using System.Diagnostics;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using Maestro.Editors.Common;
+using Maestro.Editors.Common;
 using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.LayerDefinition
 {
@@ -69,9 +65,9 @@
             base.UnsubscribeEventHandlers();
         }
 
-        void OnVectorLayerPropertyChanged(object sender, PropertyChangedEventArgs e)
+        private void OnVectorLayerPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            //Feature Source changed 
+            //Feature Source changed
             if (e.PropertyName == "ResourceId") //NOXLATE
             {
                 PopulatePropertyList();
@@ -242,7 +238,7 @@
             return clone;
         }
 
-        static bool IsMapped(DataGridViewRow row)
+        private static bool IsMapped(DataGridViewRow row)
         {
             return row.Cells[0].Value != null && Convert.ToBoolean(row.Cells[0].Value);
         }
@@ -260,7 +256,7 @@
                     var swap = grdProperties.Rows[idx];
                     grdProperties.Rows.RemoveAt(rowIdx);
                     grdProperties.Rows.RemoveAt(idx);
-                    
+
                     var rowClone = CloneRow(row);
                     var swapClone = CloneRow(swap);
                     grdProperties.Rows.Insert(idx, rowClone);
@@ -320,4 +316,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace Maestro.Editors.LayerDefinition
@@ -29,7 +29,7 @@
     /// editing Layer Definition documents
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerAdvancedSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerAdvancedSectionCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerAdvancedSectionCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using System;
+using System.ComponentModel;
 
 namespace Maestro.Editors.LayerDefinition.Raster
 {
@@ -318,4 +316,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,44 +1,44 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using System.Diagnostics;
 using Maestro.Editors.Generic;
+using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using Maestro.Shared.UI;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.LayerDefinition.Raster
 {
     //NOTE: Unlike the Vector Layer editor, we have to do a full schema walk here because
     //we need to filter out non-raster feature classes, something that the existing GetSchemas()
     //and GetClassNames() cannot do for us.
-    
+
     [ToolboxItem(false)]
     internal partial class RasterLayerSettingsSectionCtrl : EditorBindableCollapsiblePanel
     {
@@ -67,7 +67,7 @@
             _rl.PropertyChanged += WeakEventHandler.Wrap<PropertyChangedEventHandler>(OnRasterLayerPropertyChanged, (eh) => _rl.PropertyChanged -= eh);
         }
 
-        void OnRasterLayerPropertyChanged(object sender, PropertyChangedEventArgs e)
+        private void OnRasterLayerPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             OnResourceChanged();
         }
@@ -229,4 +229,4 @@
             _edsvc.OpenResource(txtFeatureSource.Text);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerVisibilitySectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerVisibilitySectionCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerVisibilitySectionCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using System;
+using System.ComponentModel;
 using System.Globalization;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Editors.LayerDefinition.Raster
 {
@@ -158,4 +156,4 @@
             OnResourceChanged();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/RasterLayerEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/RasterLayerEditorCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/RasterLayerEditorCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 
 namespace Maestro.Editors.LayerDefinition
@@ -60,4 +56,4 @@
             rasterLayerAdvancedSectionCtrl.Bind(_edsvc);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/FeaturePreviewRender.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/FeaturePreviewRender.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/FeaturePreviewRender.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,41 +1,40 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
-using System;
-using System.Drawing;
-using System.Collections;
-using System.Drawing.Imaging;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
+using Maestro.Editors.LayerDefinition.Vector.StyleEditors;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using System;
 using System.Collections.Generic;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.LayerDefinition.Vector.StyleEditors;
+using System.Drawing;
 
 namespace Maestro.Editors.LayerDefinition.Vector
 {
-
     internal class FeaturePreviewRender
     {
         private static ImageStylePicker.NamedImage[] m_fillImages = null;
         private static ImageStylePicker.NamedImage[] m_lineStyles = null;
 
-
         public static void RenderPreviewArea(Graphics g, Rectangle size, IAreaSymbolizationFill item)
         {
             if (item == null)
@@ -47,7 +46,7 @@
             //Adjust, since painting always excludes top/right and includes left/bottom
             Rectangle size_adj = new Rectangle(size.X, size.Y, size.Width - 1, size.Height - 1);
 
-            Point[] points = new Point[] 
+            Point[] points = new Point[]
             {
                 new Point(size_adj.Left, size_adj.Top),
                 new Point(size_adj.Right, size_adj.Top),
@@ -59,7 +58,7 @@
             if (item.Fill != null)
             {
                 Brush b = null;
-            
+
                 Image texture = null;
                 foreach (ImageStylePicker.NamedImage img in FillImages)
                 {
@@ -98,7 +97,6 @@
                                     bmp.SetPixel(x, y, bg.Value);
                             }
 
-
                         texture = bmp;
                         break;
                     }
@@ -136,7 +134,6 @@
                         g.DrawPolygon(p, points); //TODO: Implement line dash
                 }
             }
-
         }
 
         public static void RenderPreviewLine(Graphics g, Rectangle size, IEnumerable<IStroke> item)
@@ -191,7 +188,6 @@
             Color? background = null;
             string text = string.Empty;
             BackgroundStyleType bgStyle;
-            
 
             if (item == null || item.FontName == null)
             {
@@ -332,11 +328,12 @@
             int npoints = Math.Min(Math.Max(15, radius / 5), 100);
             Point center = new Point(size_adj.X + size_adj.Width / 2, size_adj.Y + size_adj.Height / 2);
 
-            switch(item.Shape)
+            switch (item.Shape)
             {
                 case ShapeType.Square:
                     points = Rotate(CreateNGon(center, radius, 4), center, Math.PI / 4);
                     break;
+
                 case ShapeType.Star:
                     Point[] outerStar = Rotate(CreateNGon(center, radius, 5), center, -Math.PI / 2);
                     Point[] innerStar = Rotate(Rotate(CreateNGon(center, radius / 2, 5), center, -Math.PI / 2), center, Math.PI / 5);
@@ -345,9 +342,11 @@
                         points[i] = i % 2 == 0 ? outerStar[i >> 1] : innerStar[i >> 1];
                     //points = innerStar;
                     break;
+
                 case ShapeType.Triangle:
                     points = Rotate(CreateNGon(center, radius, 3), center, Math.PI / 6);
                     break;
+
                 case ShapeType.Cross:
                 case ShapeType.X:
                     Point[] outerCross = Rotate(CreateNGon(center, radius, 4), center, -Math.PI / 2);
@@ -370,11 +369,12 @@
                     if (item.Shape == ShapeType.X)
                         points = Rotate(points, center, Math.PI / 4);
                     break;
+
                 default: //Circle
-                {
-                    points = CreateNGon(center, radius, Math.Min(Math.Max(15, radius / 5), 100));
-                    break;
-                }				
+                    {
+                        points = CreateNGon(center, radius, Math.Min(Math.Max(15, radius / 5), 100));
+                        break;
+                    }
             }
 
             if (item.Fill != null)
@@ -419,7 +419,6 @@
                                     bmp.SetPixel(x, y, bgColor.Value);
                             }
 
-
                         texture = bmp;
                         break;
                     }
@@ -458,7 +457,7 @@
         {
             //TODO: This will currently just draw the default W2D image, it will not consider color overrides nor size parameters
             //But something is better than nothing at the moment.
-            
+
             if (image != null)
             {
                 //Start from center
@@ -468,7 +467,7 @@
                 location.X -= image.Width / 2;
                 location.Y -= image.Height / 2;
 
-                //Draw the result. 
+                //Draw the result.
                 graphics.DrawImage(image, location);
             }
         }
@@ -530,7 +529,6 @@
 
         internal static void RenderNoPreview(Graphics graphics, Rectangle rect)
         {
-            
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/RuleGridView.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/RuleGridView.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/RuleGridView.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,40 +1,40 @@
 #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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.LayerDefinition.Vector.Scales;
+using Maestro.Editors.LayerDefinition.Vector.StyleEditors;
+using Maestro.Editors.LayerDefinition.Vector.Thematics;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using Maestro.Editors.LayerDefinition.Vector.StyleEditors;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using Maestro.Editors.LayerDefinition.Vector.Scales;
-using System.Diagnostics;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using Maestro.Editors.LayerDefinition.Vector.Thematics;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Editors.LayerDefinition.Vector.GridEditor
 {
@@ -62,7 +62,7 @@
             grdRules.RowsAdded += OnGridRowsAdded;
         }
 
-        void OnGridRowsAdded(object sender, DataGridViewRowsAddedEventArgs e)
+        private void OnGridRowsAdded(object sender, DataGridViewRowsAddedEventArgs e)
         {
             if (_init)
                 return;
@@ -90,7 +90,7 @@
             if (_init)
                 return;
 
-            switch(e.ListChangedType)
+            switch (e.ListChangedType)
             {
                 case ListChangedType.ItemChanged:
                     if (e.PropertyDescriptor != null)
@@ -101,6 +101,7 @@
                         }
                     }
                     break;
+
                 case ListChangedType.ItemMoved:
                     break;
             }
@@ -179,6 +180,7 @@
                             }
                         }
                         break;
+
                     case StyleType.Line:
                         {
                             ILineVectorStyle lts = style as ILineVectorStyle;
@@ -192,6 +194,7 @@
                             }
                         }
                         break;
+
                     case StyleType.Area:
                         {
                             IAreaVectorStyle ats = style as IAreaVectorStyle;
@@ -205,6 +208,7 @@
                             }
                         }
                         break;
+
                     case StyleType.Composite:
                         {
                             ICompositeTypeStyle cts = style as ICompositeTypeStyle;
@@ -238,6 +242,7 @@
                             }
                         }
                         break;
+
                     case StyleType.Line:
                         {
                             for (int i = 0; i < style.RuleCount; i++)
@@ -247,6 +252,7 @@
                             }
                         }
                         break;
+
                     case StyleType.Area:
                         {
                             for (int i = 0; i < style.RuleCount; i++)
@@ -256,6 +262,7 @@
                             }
                         }
                         break;
+
                     case StyleType.Composite:
                         {
                             for (int i = 0; i < style.RuleCount; i++)
@@ -286,7 +293,7 @@
         }
 
         /// <summary>
-        /// Gets or sets the theme index offset. Apply a theme offset if you have a layer with multiple styles and 
+        /// Gets or sets the theme index offset. Apply a theme offset if you have a layer with multiple styles and
         /// your are editing any style beyond the first one. The offset should be the total number of rules before
         /// the style being edited
         /// </summary>
@@ -345,12 +352,15 @@
                 case StyleType.Point:
                     styleType = 1;
                     break;
+
                 case StyleType.Line:
                     styleType = 2;
                     break;
+
                 case StyleType.Area:
                     styleType = 3;
                     break;
+
                 case StyleType.Composite:
                     styleType = 4;
                     break;
@@ -409,7 +419,8 @@
 
         private void grdRules_CellClick(object sender, DataGridViewCellEventArgs e)
         {
-            if (e.ColumnIndex >= 0 && e.RowIndex >= 0) {
+            if (e.ColumnIndex >= 0 && e.RowIndex >= 0)
+            {
                 var rule = (RuleModel)grdRules.Rows[e.RowIndex].DataBoundItem;
                 var cell = grdRules.Rows[e.RowIndex].Cells[e.ColumnIndex];
                 var col = cell.OwningColumn;
@@ -419,13 +430,16 @@
                     case "Style":
                         EditRuleStyle(rule);
                         break;
+
                     case "Label":
                         EditLabelStyle(rule);
                         break;
+
                     case "LegendLabel":
                         grdRules.CurrentCell = cell;
                         grdRules.BeginEdit(true);
                         break;
+
                     case "Filter":
                         {
                             var expr = rule.Filter;
@@ -721,7 +735,7 @@
 
         private ClassDefinition GetLayerClass()
         {
-            if (_layerClass == null) 
+            if (_layerClass == null)
             {
                 IVectorLayerDefinition vl = (IVectorLayerDefinition)_editedLayer.SubLayer;
                 _layerClass = _edSvc.CurrentConnection.FeatureService.GetClassDefinition(vl.ResourceId, vl.FeatureName);
@@ -750,7 +764,7 @@
 
         private void btnAddRule_Click(object sender, EventArgs e)
         {
-            switch(_style.StyleType)
+            switch (_style.StyleType)
             {
                 case StyleType.Point:
                     {
@@ -760,6 +774,7 @@
                         _rules.Add(model);
                     }
                     break;
+
                 case StyleType.Line:
                     {
                         var rule = _editedLayer.CreateDefaultLineRule();
@@ -768,6 +783,7 @@
                         _rules.Add(model);
                     }
                     break;
+
                 case StyleType.Area:
                     {
                         var rule = _editedLayer.CreateDefaultAreaRule();
@@ -776,6 +792,7 @@
                         _rules.Add(model);
                     }
                     break;
+
                 case StyleType.Composite:
                     {
                         var rule = _editedLayer.CreateDefaultCompositeRule();
@@ -803,15 +820,15 @@
                 {
                     _init = true;
                     //Remove in reverse order
-                    foreach(var r in remove)
+                    foreach (var r in remove)
                     {
                         _rules.Remove(r);
                     }
                 }
-                finally 
+                finally
                 {
                     //Yes, we're going thermonuclear, simply because the BindingList's ordering may be out of sync with the underlying
-                    //model as a result of removing rules. Since the BindingList is currently the point of truth (we just made changes to it), 
+                    //model as a result of removing rules. Since the BindingList is currently the point of truth (we just made changes to it),
                     //the underlying model has to be updated to match
                     ReSyncBindingListToRules(_style);
                     _edSvc.SyncSessionCopy();
@@ -990,10 +1007,12 @@
                             ((IPointVectorStyle)_style).AddRule((IPointRule)clone.UnwrapRule());
                             clone.SetIndex(_style.RuleCount - 1);
                             break;
+
                         case StyleType.Line:
                             ((ILineVectorStyle)_style).AddRule((ILineRule)clone.UnwrapRule());
                             clone.SetIndex(_style.RuleCount - 1);
                             break;
+
                         case StyleType.Area:
                             ((IAreaVectorStyle)_style).AddRule((IAreaRule)clone.UnwrapRule());
                             clone.SetIndex(_style.RuleCount - 1);
@@ -1013,4 +1032,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/RuleModel.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/RuleModel.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/RuleModel.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,30 @@
 #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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
-using System.Linq;
-using System.Text;
 
 namespace Maestro.Editors.LayerDefinition.Vector.GridEditor
 {
@@ -31,13 +32,19 @@
     {
         [Browsable(false)]
         int Index { get; }
+
         string Filter { get; }
+
         string LegendLabel { get; set; }
+
         Image Style { get; }
 
         void SetRuleStylePreview(Image image);
+
         void SwapIndicesWith(IRuleModel model);
+
         void SetIndex(int index);
+
         object UnwrapRule();
 
         IRuleModel CloneRuleModel(ILayerElementFactory factory);
@@ -47,12 +54,19 @@
     {
         [Browsable(false)]
         int Index { get; }
+
         string Filter { get; }
+
         string LegendLabel { get; set; }
+
         Image Style { get; }
+
         Image Label { get; }
+
         void SwapIndicesWith(ILabeledRuleModel model);
+
         void SetIndex(int index);
+
         object UnwrapRule();
 
         ILabeledRuleModel CloneLabeledRuleModel(ILayerElementFactory factory);
@@ -69,7 +83,10 @@
 
         public abstract Image Style { get; protected set; }
 
-        public void SetIndex(int index) { this.Index = index; }
+        public void SetIndex(int index)
+        {
+            this.Index = index;
+        }
 
         [Browsable(false)]
         public bool HasStyle { get; protected set; }
@@ -423,7 +440,7 @@
             return new AreaRuleModel(clone, -1);
         }
     }
-    
+
     internal class CompositeRuleModel : RuleModel
     {
         private ICompositeRule _rule;
@@ -511,4 +528,4 @@
             return new CompositeRuleModel(clone, -1);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/VectorScaleRangeGrid.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/VectorScaleRangeGrid.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/GridEditor/VectorScaleRangeGrid.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,31 @@
 #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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System.Diagnostics;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.LayerDefinition.Vector.GridEditor
 {
@@ -329,4 +328,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/ILayerStylePreviewable.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/ILayerStylePreviewable.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/ILayerStylePreviewable.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,25 @@
-#region Disclaimer / License
-// Copyright (C) 2012, 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
+#region Disclaimer / License
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+// Copyright (C) 2012, 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
+
 namespace Maestro.Editors.LayerDefinition.Vector
 {
     internal interface ILayerStylePreviewable
@@ -88,4 +85,4 @@
             private set;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/CompositeStyleListCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/CompositeStyleListCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/CompositeStyleListCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 
 namespace Maestro.Editors.LayerDefinition.Vector.Scales
 {
@@ -43,6 +43,7 @@
         }
 
         internal VectorLayerEditorCtrl Owner { get; set; }
+
         internal ILayerElementFactory Factory { get; set; }
 
         private IVectorScaleRange2 _parent;
@@ -151,4 +152,4 @@
             this.Owner.RaiseResourceChanged();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/Condition.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/Condition.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/Condition.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using Maestro.Editors.Common;
 
 namespace Maestro.Editors.LayerDefinition.Vector.Scales
 {
@@ -40,6 +40,7 @@
         private bool m_isUpdating = false;
 
         public event EventHandler ItemDeleted;
+
         public event EventHandler ItemChanged;
 
         private VectorLayerEditorCtrl m_owner;
@@ -262,10 +263,9 @@
             this.Focus();
         }
 
-
         internal void SetThemeOffset(int offset)
         {
             FeatureStyle.SetThemeOffset(offset);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionList.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionList.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionList.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 
 namespace Maestro.Editors.LayerDefinition.Vector.Scales
 {
@@ -41,6 +39,7 @@
         private object m_selectedItem;
 
         public event EventHandler SelectionChanged;
+
         public event EventHandler ItemChanged;
 
         private VectorLayerEditorCtrl m_owner;
@@ -83,8 +82,8 @@
         }
 
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-        public object SelectedItem 
-        { 
+        public object SelectedItem
+        {
             get { return m_selectedItem; }
             set
             {
@@ -182,7 +181,7 @@
                     {
                         scale = Math.Floor(m_parent.MaxScale.Value - 0.0001);
                     }
-                    else //both false 
+                    else //both false
                     {
                         scale = 42; //Any number will do
                     }
@@ -227,7 +226,7 @@
                 return;
 
             c.BorderStyle = BorderStyle.None;
-           
+
             m_selectedItem = null;
             if (SelectionChanged != null)
                 SelectionChanged(this, null);
@@ -261,12 +260,12 @@
             }
         }
 
-        void Rule_ItemChanged(object sender, EventArgs e)
+        private void Rule_ItemChanged(object sender, EventArgs e)
         {
             SignalItemChanged();
         }
 
-        void Rule_ItemDeleted(object sender, EventArgs e)
+        private void Rule_ItemDeleted(object sender, EventArgs e)
         {
             foreach (Condition c in this.Controls)
             {
@@ -339,7 +338,6 @@
             }
 
             SignalItemChanged();
-            
         }
 
         public void MoveSelectedRule(bool down)
@@ -400,7 +398,6 @@
             return minHeight;
         }
 
-
         internal void SetThemeOffset(int offset)
         {
             foreach (var c in this.Controls)
@@ -412,4 +409,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,36 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.LayerDefinition.Vector.Thematics;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using OSGeo.MapGuide.ObjectModels;
-using Maestro.Editors.LayerDefinition.Vector.Thematics;
-using Maestro.Editors.LayerDefinition.Vector.StyleEditors;
-using Maestro.Shared.UI;
 
 namespace Maestro.Editors.LayerDefinition.Vector.Scales
 {
@@ -80,7 +77,7 @@
         {
             m_lastSelection = m_currentSelection;
             m_currentSelection = conditionList.SelectedItem;
-            CopyRuleButton.Enabled = MoveRuleUpButton.Enabled = MoveRuleDownButton.Enabled = m_currentSelection != null || m_lastSelection != null;        
+            CopyRuleButton.Enabled = MoveRuleUpButton.Enabled = MoveRuleDownButton.Enabled = m_currentSelection != null || m_lastSelection != null;
         }
 
         public void SetItem(IVectorScaleRange parent, IPointVectorStyle point)
@@ -200,9 +197,9 @@
                     return;
                 }
                 ThemeCreator dlg = new ThemeCreator(
-                    m_owner.Editor, 
+                    m_owner.Editor,
                     layer,
-                    m_owner.SelectedClass, 
+                    m_owner.SelectedClass,
                     owner);
                 if (dlg.ShowDialog(this) == DialogResult.OK)
                 {
@@ -226,7 +223,6 @@
                 m_owner.SetLastException(ex);
                 MessageBox.Show(this, string.Format(Strings.GenericError, msg), Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
-            
         }
 
         private void CopyRuleButton_Click(object sender, EventArgs e)
@@ -288,7 +284,6 @@
                 ItemChanged(sender, null);
         }
 
-
         public void ResizeAuto()
         {
             this.Height = this.GetPreferedHeight();
@@ -369,4 +364,4 @@
             conditionList.SetThemeOffset(offset);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/EditorTemplateForm.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/EditorTemplateForm.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/EditorTemplateForm.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.LayerDefinition.Vector.Scales

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ExplodeThemeDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ExplodeThemeDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ExplodeThemeDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.Globalization;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.LayerDefinition.Vector.Scales
@@ -156,4 +153,4 @@
             GeneratePreviews();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ItemStyle.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ItemStyle.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ItemStyle.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.LayerDefinition.Vector.StyleEditors;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using Maestro.Editors.LayerDefinition.Vector.StyleEditors;
 
 namespace Maestro.Editors.LayerDefinition.Vector.Scales
 {
@@ -277,7 +277,7 @@
 
                     m_w2dsymbol = w2d;
                 };
-                rollback = () => 
+                rollback = () =>
                 {
                     ((IPointRule)m_parent).PointSymbolization2D = m_origPoint;
                 };
@@ -291,7 +291,7 @@
                 uc = lfse;
                 lfse.Item = m_editLine;
 
-                Action editCommit = () => 
+                Action editCommit = () =>
                 {
                     m_editLine = lfse.Item;
                     ((ILineRule)m_parent).SetStrokes(m_editLine);
@@ -375,7 +375,6 @@
                     }
                     else if (isLine)
                     {
-                           
                         if (ItemChanged != null)
                             ItemChanged(m_line, null);
                     }
@@ -393,13 +392,12 @@
                         rollback.Invoke();
                 }
             }
-
         }
 
         private void previewPicture_Click(object sender, EventArgs e)
         {
             try { Parent.Focus(); }
-            catch {}
+            catch { }
         }
 
         private void previewPicture_DoubleClick(object sender, EventArgs e)
@@ -417,4 +415,4 @@
             _themeOffset = offset;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceEditors/ReferenceCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceEditors/ReferenceCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceEditors/ReferenceCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Generic;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Editors.LayerDefinition.Vector.Scales.SymbolInstanceEditors
 {
@@ -49,7 +47,7 @@
         private void btnBrowse_Click(object sender, EventArgs e)
         {
             using (var picker = new ResourcePicker(_edSvc.CurrentConnection,
-                                                   ResourceTypes.SymbolDefinition.ToString(), 
+                                                   ResourceTypes.SymbolDefinition.ToString(),
                                                    ResourcePickerMode.OpenResource))
             {
                 if (picker.ShowDialog() == DialogResult.OK)
@@ -60,4 +58,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancePropertiesDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancePropertiesDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancePropertiesDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
-using Maestro.Editors.SymbolDefinition;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.LayerDefinition.Vector.Scales
@@ -118,4 +114,4 @@
 
         public bool HasChanged { get; private set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,44 +1,45 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using Maestro.Editors.Generic;
+using Maestro.Editors.LayerDefinition.Vector.Scales.SymbolInstanceEditors;
+using Maestro.Editors.LayerDefinition.Vector.Scales.SymbolParamEditors;
+using Maestro.Editors.Preview;
+using Maestro.Editors.SymbolDefinition;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Text;
+using System.Globalization;
+using System.IO;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using Maestro.Editors.SymbolDefinition;
-using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-using Maestro.Editors.LayerDefinition.Vector.Scales.SymbolInstanceEditors;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using Maestro.Shared.UI;
-using Maestro.Editors.Preview;
-using System.IO;
-using Maestro.Editors.LayerDefinition.Vector.Scales.SymbolParamEditors;
-using System.Globalization;
-using Maestro.Editors.Common;
 
 namespace Maestro.Editors.LayerDefinition.Vector.Scales
 {
@@ -55,7 +56,7 @@
         private ILayerStylePreviewable _preview;
         private BindingList<ParameterModel> _params = new BindingList<ParameterModel>();
 
-        class ParameterModel : INotifyPropertyChanged
+        private class ParameterModel : INotifyPropertyChanged
         {
             private IParameterOverride _ov;
             private IParameter _pdef;
@@ -154,7 +155,7 @@
                     e.Graphics.DrawImage(_previewImg, new Point(0, 0));
                 }
             }
-            else 
+            else
             {
                 e.Graphics.DrawString(Strings.TextRenderPreviewNotAvailable, Control.DefaultFont, Brushes.Black, new PointF(0, 0));
             }
@@ -196,6 +197,7 @@
                     }
                     previewSymbol = (ISymbolDefinitionBase)conn.ResourceService.GetResource(resId);
                     break;
+
                 case SymbolInstanceType.Reference:
                     previewSymbol = (ISymbolDefinitionBase)conn.ResourceService.GetResource(((ISymbolInstanceReferenceLibrary)symInst.Reference).ResourceId);
                     previewSymbol = (ISymbolDefinitionBase)previewSymbol.Clone();
@@ -265,8 +267,8 @@
             var vl = (IVectorLayerDefinition)res.SubLayer;
             if (vl.SymbolDefinitionVersion == null)
                 throw new InvalidOperationException(Strings.ErrorLayerDefnitionDoesNotSupportCompositeSymbolization);
-            var ssym = ObjectFactory.CreateSimpleSymbol(_edSvc.GetEditedResource().CurrentConnection, 
-                                                        vl.SymbolDefinitionVersion, 
+            var ssym = ObjectFactory.CreateSimpleSymbol(_edSvc.GetEditedResource().CurrentConnection,
+                                                        vl.SymbolDefinitionVersion,
                                                         "InlineSimpleSymbol", //NOXLATE
                                                         Strings.TextInlineSimpleSymbol);
 
@@ -733,7 +735,7 @@
             if (vl.SymbolDefinitionVersion == null)
                 throw new InvalidOperationException(Strings.ErrorLayerDefnitionDoesNotSupportCompositeSymbolization);
             var ssym = ObjectFactory.CreateSimpleLabel(_edSvc.GetEditedResource().CurrentConnection,
-                                                       vl.SymbolDefinitionVersion, 
+                                                       vl.SymbolDefinitionVersion,
                                                        GeometryContextType.Point);
 
             var instance = _comp.CreateInlineSimpleSymbol(ssym);
@@ -781,4 +783,4 @@
             AddInstance(instance, true);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolParamEditors/BooleanEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolParamEditors/BooleanEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolParamEditors/BooleanEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,27 @@
 #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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.LayerDefinition.Vector.Scales.SymbolParamEditors
@@ -85,4 +82,4 @@
             this.DialogResult = System.Windows.Forms.DialogResult.Cancel;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolParamEditors/NumberEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolParamEditors/NumberEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolParamEditors/NumberEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,27 @@
 #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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.LayerDefinition.Vector.Scales.SymbolParamEditors
@@ -46,6 +43,7 @@
                     numericUpDown.Value = value;
                     this.Text = dt.ToString();
                     break;
+
                 case DataType2.Real:
                 case DataType2.LineWeight:
                     numericUpDown.Minimum = decimal.MinValue;
@@ -53,18 +51,21 @@
                     numericUpDown.Value = value;
                     this.Text = dt.ToString();
                     break;
+
                 case DataType2.Angle:
                     numericUpDown.Minimum = Convert.ToDecimal(0.0);
                     numericUpDown.Maximum = Convert.ToDecimal(360.0);
                     numericUpDown.Value = value;
                     this.Text = dt.ToString();
                     break;
+
                 case DataType2.ObliqueAngle:
                     numericUpDown.Minimum = Convert.ToDecimal(-85.0);
                     numericUpDown.Maximum = Convert.ToDecimal(85.0);
                     numericUpDown.Value = value;
                     this.Text = dt.ToString();
                     break;
+
                 case DataType2.TrackSpacing:
                     numericUpDown.Minimum = Convert.ToDecimal(0.75);
                     numericUpDown.Maximum = Convert.ToDecimal(10.0);
@@ -89,4 +90,4 @@
             this.DialogResult = System.Windows.Forms.DialogResult.OK;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/VectorScaleRangeCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 
 namespace Maestro.Editors.LayerDefinition.Vector.Scales
 {
@@ -105,7 +104,7 @@
                         _cts.Add(c);
 
                     chkComposite.Checked = (_cts.Count > 0);
-                    
+
                     compList.Owner = parent.Owner;
                     compList.Factory = parent.Factory;
                     if (_cts.Count == 0)
@@ -242,4 +241,4 @@
             _parent.RaiseResourceChanged();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;
+using System.ComponentModel;
 using System.Drawing;
-using System.Collections;
-using System.ComponentModel;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using Maestro.Shared.UI;
 
 namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
 {
@@ -117,7 +117,7 @@
             try
             {
                 m_inUpdate = true;
-                
+
                 if (m_item == null)
                 {
                     fillStyleEditor.displayFill.Checked = false;
@@ -135,7 +135,7 @@
                     if (fillStyleEditor.fillCombo.SelectedItem == null && fillStyleEditor.fillCombo.Items.Count > 0)
                         fillStyleEditor.fillCombo.SelectedIndex = fillStyleEditor.fillCombo.FindString(m_item.Fill.FillPattern);
                 }
-                
+
                 lineStyleEditor.displayLine.Checked = m_item.Stroke != null;
                 if (m_item.Stroke != null)
                 {
@@ -157,7 +157,7 @@
                 }
 
                 UpdatePreviewResult();
-            } 
+            }
             finally
             {
                 m_inUpdate = false;
@@ -191,7 +191,7 @@
             }
         }
 
-        public IAreaSymbolizationFill Item 
+        public IAreaSymbolizationFill Item
         {
             get { return m_item; }
             set
@@ -398,8 +398,8 @@
                 UpdatePreviewResult();
             }
         }
-        
-        void LineStyleEditor_RequiresExpressionEditor(object sender, EventArgs e)
+
+        private void LineStyleEditor_RequiresExpressionEditor(object sender, EventArgs e)
         {
             string expr = m_editor.EditExpression(lineStyleEditor.colorCombo.ColorExpression, m_schema, m_providername, m_featureSource, true);
             if (expr != null)
@@ -434,4 +434,4 @@
             _editCommit = editCommit;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using OSGeo.MapGuide.MaestroAPI;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Common;
 
 namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
 {
@@ -53,7 +53,7 @@
         public string ColorExpression
         {
             get { return txtColor.Text; }
-            set 
+            set
             {
                 txtColor.Text = value;
             }
@@ -104,4 +104,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ElevationDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 
 namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
 {
@@ -140,4 +138,4 @@
             this.DialogResult = DialogResult.Cancel;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Windows.Forms;
-using Maestro.Editors.Common;
 
 namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
 {
@@ -37,7 +35,7 @@
         {
             // This call is required by the Windows.Forms Form Designer.
             InitializeComponent();
-        
+
             fillCombo.Items.Clear();
             fillCombo.Items.AddRange(FeaturePreviewRender.FillImages);
         }
@@ -48,16 +46,17 @@
 
         private void displayFill_CheckedChanged(object sender, System.EventArgs e)
         {
-            lblFill.Enabled = 
-            lblForeground.Enabled = 
-            lblBackground.Enabled = 
+            lblFill.Enabled =
+            lblForeground.Enabled =
+            lblBackground.Enabled =
             fillCombo.Enabled =
             foregroundColor.Enabled =
-            backgroundColor.Enabled = 
+            backgroundColor.Enabled =
                 displayFill.Checked;
         }
 
         public event EventHandler ForegroundRequiresExpression;
+
         public event EventHandler BackgroundRequiresExpression;
 
         private void foregroundColor_RequestExpressionEditor(object sender, EventArgs e)
@@ -74,4 +73,4 @@
                 handler(this, EventArgs.Empty);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;
-using System.Drawing;
-using System.Collections;
 using System.ComponentModel;
+using System.Drawing;
 using System.Windows.Forms;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 
 namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
 {
@@ -38,7 +37,7 @@
     internal partial class FontStyleEditor : System.Windows.Forms.UserControl
     {
         private ITextSymbol m_item;
-        
+
         private bool m_inUpdate = false;
 
         public event EventHandler Changed;
@@ -74,7 +73,6 @@
             fontCombo.Items.Clear();
             foreach (FontFamily f in new System.Drawing.Text.InstalledFontCollection().Families)
                 fontCombo.Items.Add(f.Name);
-
         }
 
         private FontStyleEditor()
@@ -84,11 +82,10 @@
             //
             InitializeComponent();
 
-            using(System.IO.StringReader sr = new System.IO.StringReader(Strings.GeometryStyleComboDataset))
+            using (System.IO.StringReader sr = new System.IO.StringReader(Strings.GeometryStyleComboDataset))
                 ComboBoxDataSet.ReadXml(sr);
         }
 
-
         private void UpdateDisplay()
         {
             if (m_inUpdate)
@@ -150,9 +147,6 @@
             }
         }
 
-
-        
-
         private void propertyCombo_SelectedIndexChanged(object sender, System.EventArgs e)
         {
             if (m_inUpdate || m_item == null)
@@ -347,7 +341,7 @@
             }
         }
 
-        static double? StringToDouble(string value)
+        private static double? StringToDouble(string value)
         {
             double d;
             if (double.TryParse(value, out d))
@@ -362,7 +356,6 @@
 
         private void fontGroup_Enter(object sender, System.EventArgs e)
         {
-        
         }
 
         private void propertyCombo_TextChanged(object sender, System.EventArgs e)
@@ -380,7 +373,7 @@
         public ITextSymbol Item
         {
             get { return m_item; }
-            set 
+            set
             {
                 m_item = value;
                 UpdateDisplay();
@@ -407,7 +400,6 @@
                 DisplayLabel.Tag = m_item;
                 this.Item = null;
             }
-
         }
 
         private void sizeCombo_TextChanged(object sender, EventArgs e)
@@ -428,7 +420,6 @@
             fontCombo_SelectedIndexChanged(sender, e);
         }
 
-
         public delegate void UpdateComboTextFromSelectChangedDelegate(ComboBox owner, string text, bool userChange);
 
         private void UpdateComboTextFromSelectChanged(ComboBox owner, string text, bool userChange)
@@ -489,19 +480,18 @@
                 Changed(this, new EventArgs());
         }
 
-        
-        void TextColor_RequestExpressionEditor(object sender, EventArgs e)
+        private void TextColor_RequestExpressionEditor(object sender, EventArgs e)
         {
             string expr = m_editor.EditExpression(textColor.ColorExpression, m_schema, m_providername, m_featureSource, true);
             if (expr != null)
                 textColor.ColorExpression = expr;
         }
-        
-        void BackgroundColor_RequestExpressionEditor(object sender, EventArgs e)
+
+        private void BackgroundColor_RequestExpressionEditor(object sender, EventArgs e)
         {
             string expr = m_editor.EditExpression(backgroundColor.ColorExpression, m_schema, m_providername, m_featureSource, true);
             if (expr != null)
                 backgroundColor.ColorExpression = expr;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,36 +1,37 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
-using System;
-using System.Drawing;
-using System.Collections;
-using System.ComponentModel;
-using System.Windows.Forms;
-using System.Collections.Generic;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.MaestroAPI.Services;
-using Maestro.Shared.UI;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
 {
@@ -44,6 +45,7 @@
         /// Required designer variable.
         /// </summary>
         private System.ComponentModel.Container components = null;
+
         private System.Windows.Forms.GroupBox CompositeGroup;
         private System.Windows.Forms.Panel AdvancedPanel;
         private System.Windows.Forms.Label label3;
@@ -56,7 +58,7 @@
         private System.Windows.Forms.ComboBox sizeUnitsCombo;
         private System.Windows.Forms.ComboBox sizeContextCombo;
         private LineStyleEditor lineStyleEditor;
-        
+
         private IList<IStroke> m_item = null;
         private System.Windows.Forms.Panel compositePanel;
         private System.Windows.Forms.GroupBox lineGroup;
@@ -162,7 +164,6 @@
             {
                 m_inUpdate = false;
             }
-
         }
 
         private void UpdateDisplayForSelected()
@@ -172,7 +173,7 @@
             {
                 m_inUpdate = true;
                 IStroke st = this.CurrentStrokeType;
-                sizeGroup.Enabled = 
+                sizeGroup.Enabled =
                 lineGroup.Enabled =
                 previewGroup.Enabled =
                     st != null;
@@ -182,7 +183,7 @@
                 if (st != null)
                 {
                     sizeUnitsCombo.SelectedValue = st.Unit.ToString();
-                    
+
                     //sizeContextCombo.SelectedValue = st.SizeContext.ToString();
 
                     if (st.Color == null)
@@ -190,7 +191,7 @@
                     else
                         lineStyleEditor.colorCombo.ColorExpression = st.Color;
 
-                    foreach(object i in lineStyleEditor.fillCombo.Items)
+                    foreach (object i in lineStyleEditor.fillCombo.Items)
                         if (i as ImageStylePicker.NamedImage != null && (i as ImageStylePicker.NamedImage).Name == st.LineStyle)
                         {
                             lineStyleEditor.fillCombo.SelectedItem = i;
@@ -207,17 +208,16 @@
                         sizeContextCombo.Enabled = false;
                 }
                 UpdatePreviewResult();
-            } 
+            }
             finally
             {
                 m_inUpdate = prevUpdate;
             }
-
         }
 
         private IStroke CurrentStrokeType
         {
-            get 
+            get
             {
                 if (lineStyles.Items.Count == 0)
                     return null;
@@ -231,19 +231,20 @@
         /// <summary>
         /// Clean up any resources being used.
         /// </summary>
-        protected override void Dispose( bool disposing )
+        protected override void Dispose(bool disposing)
         {
-            if( disposing )
+            if (disposing)
             {
-                if(components != null)
+                if (components != null)
                 {
                     components.Dispose();
                 }
             }
-            base.Dispose( disposing );
+            base.Dispose(disposing);
         }
 
         #region Windows Form Designer generated code
+
         /// <summary>
         /// Required method for Designer support - do not modify
         /// the contents of this method with the code editor.
@@ -291,33 +292,33 @@
             ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).BeginInit();
             this.SuspendLayout();
-            // 
+            //
             // applyLineStyle
-            // 
+            //
             this.applyLineStyle.Checked = true;
             this.applyLineStyle.CheckState = System.Windows.Forms.CheckState.Checked;
             resources.ApplyResources(this.applyLineStyle, "applyLineStyle");
             this.applyLineStyle.Name = "applyLineStyle";
             this.applyLineStyle.CheckedChanged += new System.EventHandler(this.applyLineStyle_CheckedChanged);
-            // 
+            //
             // compositeLines
-            // 
+            //
             this.compositeLines.Checked = true;
             this.compositeLines.CheckState = System.Windows.Forms.CheckState.Checked;
             resources.ApplyResources(this.compositeLines, "compositeLines");
             this.compositeLines.Name = "compositeLines";
             this.compositeLines.CheckedChanged += new System.EventHandler(this.compositeLines_CheckedChanged);
-            // 
+            //
             // CompositeGroup
-            // 
+            //
             this.CompositeGroup.Controls.Add(this.toolStrip1);
             this.CompositeGroup.Controls.Add(this.lineStyles);
             resources.ApplyResources(this.CompositeGroup, "CompositeGroup");
             this.CompositeGroup.Name = "CompositeGroup";
             this.CompositeGroup.TabStop = false;
-            // 
+            //
             // toolStrip1
-            // 
+            //
             this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.AddStyleButton,
@@ -325,65 +326,65 @@
             resources.ApplyResources(this.toolStrip1, "toolStrip1");
             this.toolStrip1.Name = "toolStrip1";
             this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
-            // 
+            //
             // AddStyleButton
-            // 
+            //
             this.AddStyleButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
             resources.ApplyResources(this.AddStyleButton, "AddStyleButton");
             this.AddStyleButton.Name = "AddStyleButton";
             this.AddStyleButton.Click += new System.EventHandler(this.AddStyleButton_Click);
-            // 
+            //
             // RemoveStyleButton
-            // 
+            //
             this.RemoveStyleButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
             resources.ApplyResources(this.RemoveStyleButton, "RemoveStyleButton");
             this.RemoveStyleButton.Name = "RemoveStyleButton";
             this.RemoveStyleButton.Click += new System.EventHandler(this.RemoveStyleButton_Click);
-            // 
+            //
             // lineStyles
-            // 
+            //
             resources.ApplyResources(this.lineStyles, "lineStyles");
             this.lineStyles.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
             this.lineStyles.Name = "lineStyles";
             this.lineStyles.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.lineStyles_DrawItem);
             this.lineStyles.SelectedIndexChanged += new System.EventHandler(this.lineStyles_SelectedIndexChanged);
-            // 
+            //
             // AdvancedPanel
-            // 
+            //
             this.AdvancedPanel.Controls.Add(this.compositeLines);
             this.AdvancedPanel.Controls.Add(this.applyLineStyle);
             resources.ApplyResources(this.AdvancedPanel, "AdvancedPanel");
             this.AdvancedPanel.Name = "AdvancedPanel";
-            // 
+            //
             // compositePanel
-            // 
+            //
             this.compositePanel.Controls.Add(this.CompositeGroup);
             resources.ApplyResources(this.compositePanel, "compositePanel");
             this.compositePanel.Name = "compositePanel";
-            // 
+            //
             // propertyPanel
-            // 
+            //
             this.propertyPanel.Controls.Add(this.lineGroup);
             this.propertyPanel.Controls.Add(this.sizeGroup);
             resources.ApplyResources(this.propertyPanel, "propertyPanel");
             this.propertyPanel.Name = "propertyPanel";
-            // 
+            //
             // lineGroup
-            // 
+            //
             this.lineGroup.Controls.Add(this.lineStyleEditor);
             resources.ApplyResources(this.lineGroup, "lineGroup");
             this.lineGroup.Name = "lineGroup";
             this.lineGroup.TabStop = false;
-            // 
+            //
             // lineStyleEditor
-            // 
+            //
             this.lineStyleEditor.ColorExpression = "";
             resources.ApplyResources(this.lineStyleEditor, "lineStyleEditor");
             this.lineStyleEditor.Name = "lineStyleEditor";
             this.lineStyleEditor.RequiresExpressionEditor += new System.EventHandler(this.lineStyleEditor_RequiresExpressionEditor);
-            // 
+            //
             // sizeGroup
-            // 
+            //
             this.sizeGroup.Controls.Add(this.sizeUnitsCombo);
             this.sizeGroup.Controls.Add(this.sizeContextCombo);
             this.sizeGroup.Controls.Add(this.label3);
@@ -391,9 +392,9 @@
             resources.ApplyResources(this.sizeGroup, "sizeGroup");
             this.sizeGroup.Name = "sizeGroup";
             this.sizeGroup.TabStop = false;
-            // 
+            //
             // sizeUnitsCombo
-            // 
+            //
             resources.ApplyResources(this.sizeUnitsCombo, "sizeUnitsCombo");
             this.sizeUnitsCombo.DataSource = this.UnitsTable;
             this.sizeUnitsCombo.DisplayMember = "Display";
@@ -401,26 +402,26 @@
             this.sizeUnitsCombo.Name = "sizeUnitsCombo";
             this.sizeUnitsCombo.ValueMember = "Value";
             this.sizeUnitsCombo.SelectedIndexChanged += new System.EventHandler(this.sizeUnitsCombo_SelectedIndexChanged);
-            // 
+            //
             // UnitsTable
-            // 
+            //
             this.UnitsTable.Columns.AddRange(new System.Data.DataColumn[] {
             this.dataColumn5,
             this.dataColumn6});
             this.UnitsTable.TableName = "Units";
-            // 
+            //
             // dataColumn5
-            // 
+            //
             this.dataColumn5.Caption = "Display";
             this.dataColumn5.ColumnName = "Display";
-            // 
+            //
             // dataColumn6
-            // 
+            //
             this.dataColumn6.Caption = "Value";
             this.dataColumn6.ColumnName = "Value";
-            // 
+            //
             // sizeContextCombo
-            // 
+            //
             resources.ApplyResources(this.sizeContextCombo, "sizeContextCombo");
             this.sizeContextCombo.DataSource = this.SizeContextTable;
             this.sizeContextCombo.DisplayMember = "Display";
@@ -428,69 +429,69 @@
             this.sizeContextCombo.Name = "sizeContextCombo";
             this.sizeContextCombo.ValueMember = "Value";
             this.sizeContextCombo.SelectedIndexChanged += new System.EventHandler(this.sizeContextCombo_SelectedIndexChanged);
-            // 
+            //
             // SizeContextTable
-            // 
+            //
             this.SizeContextTable.Columns.AddRange(new System.Data.DataColumn[] {
             this.dataColumn3,
             this.dataColumn4});
             this.SizeContextTable.TableName = "SizeContext";
-            // 
+            //
             // dataColumn3
-            // 
+            //
             this.dataColumn3.Caption = "Display";
             this.dataColumn3.ColumnName = "Display";
-            // 
+            //
             // dataColumn4
-            // 
+            //
             this.dataColumn4.Caption = "Value";
             this.dataColumn4.ColumnName = "Value";
-            // 
+            //
             // label3
-            // 
+            //
             resources.ApplyResources(this.label3, "label3");
             this.label3.Name = "label3";
-            // 
+            //
             // label2
-            // 
+            //
             resources.ApplyResources(this.label2, "label2");
             this.label2.Name = "label2";
-            // 
+            //
             // previewGroup
-            // 
+            //
             this.previewGroup.Controls.Add(this.lnkRefresh);
             this.previewGroup.Controls.Add(this.previewPicture);
             resources.ApplyResources(this.previewGroup, "previewGroup");
             this.previewGroup.Name = "previewGroup";
             this.previewGroup.TabStop = false;
-            // 
+            //
             // lnkRefresh
-            // 
+            //
             resources.ApplyResources(this.lnkRefresh, "lnkRefresh");
             this.lnkRefresh.BackColor = System.Drawing.Color.Transparent;
             this.lnkRefresh.Name = "lnkRefresh";
             this.lnkRefresh.TabStop = true;
             this.lnkRefresh.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkRefresh_LinkClicked);
-            // 
+            //
             // previewPicture
-            // 
+            //
             resources.ApplyResources(this.previewPicture, "previewPicture");
             this.previewPicture.BackColor = System.Drawing.Color.White;
             this.previewPicture.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.previewPicture.Name = "previewPicture";
             this.previewPicture.TabStop = false;
             this.previewPicture.Paint += new System.Windows.Forms.PaintEventHandler(this.previewPicture_Paint);
-            // 
+            //
             // ComboBoxDataSet
-            // 
+            //
             this.ComboBoxDataSet.DataSetName = "ComboBoxDataSet";
             this.ComboBoxDataSet.Locale = new System.Globalization.CultureInfo("da-DK");
             this.ComboBoxDataSet.Tables.AddRange(new System.Data.DataTable[] {
             this.SizeContextTable,
             this.UnitsTable});
-            // 
+            //
             // LineFeatureStyleEditor
-            // 
+            //
             resources.ApplyResources(this, "$this");
             this.Controls.Add(this.previewGroup);
             this.Controls.Add(this.propertyPanel);
@@ -514,10 +515,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).EndInit();
             this.ResumeLayout(false);
-
         }
-        #endregion
 
+        #endregion Windows Form Designer generated code
 
         private void lineStyles_SelectedIndexChanged(object sender, System.EventArgs e)
         {
@@ -613,9 +613,9 @@
 
         private void applyLineStyle_CheckedChanged(object sender, System.EventArgs e)
         {
-            compositePanel.Enabled = 
-            compositeLines.Enabled = 
-            sizeGroup.Enabled = 
+            compositePanel.Enabled =
+            compositeLines.Enabled =
+            sizeGroup.Enabled =
             lineGroup.Enabled =
             previewGroup.Enabled =
                 applyLineStyle.Checked;
@@ -685,25 +685,24 @@
             e.DrawBackground();
             if ((e.State & DrawItemState.Focus) != 0)
                 e.DrawFocusRectangle();
-            
+
             if (e.Index >= 0 && e.Index < lineStyles.Items.Count)
             {
                 var col = new BindingList<IStroke>();
-                col.Add((IStroke) lineStyles.Items[e.Index]);
-                FeaturePreviewRender.RenderPreviewLine(e.Graphics, new Rectangle(e.Bounds.Left + 1, e.Bounds.Top + 1, e.Bounds.Width - 2, e.Bounds.Height - 2), col);		
+                col.Add((IStroke)lineStyles.Items[e.Index]);
+                FeaturePreviewRender.RenderPreviewLine(e.Graphics, new Rectangle(e.Bounds.Left + 1, e.Bounds.Top + 1, e.Bounds.Width - 2, e.Bounds.Height - 2), col);
             }
         }
 
         private void RemoveStyleButton_Click(object sender, EventArgs e)
         {
-            for(int i = 0; i < m_item.Count; i++)
+            for (int i = 0; i < m_item.Count; i++)
                 if (m_item[i] == this.CurrentStrokeType)
                 {
                     m_item.RemoveAt(i);
                     UpdateDisplay();
                     break;
                 }
-
         }
 
         private void AddStyleButton_Click(object sender, EventArgs e)
@@ -780,4 +779,4 @@
             UpdatePreviewResult();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,83 +1,84 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
 using System;
-using System.Collections;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
 using System.Windows.Forms;
-using Maestro.Editors.Common;
 
 namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
 {
-	/// <summary>
-	/// Summary description for LineStyleEditor.
-	/// </summary>
+    /// <summary>
+    /// Summary description for LineStyleEditor.
+    /// </summary>
     [ToolboxItem(false)]
-	internal class LineStyleEditor : System.Windows.Forms.UserControl
-	{
+    internal class LineStyleEditor : System.Windows.Forms.UserControl
+    {
         public ImageStylePicker fillCombo;
         public Label lblColor;
-		private System.Windows.Forms.Label lblThickness;
-		private System.Windows.Forms.Label lblFill;
-		public System.Windows.Forms.CheckBox displayLine;
+        private System.Windows.Forms.Label lblThickness;
+        private System.Windows.Forms.Label lblFill;
+        public System.Windows.Forms.CheckBox displayLine;
         private System.Windows.Forms.Panel panel1;
         public ComboBox thicknessCombo;
         public ColorExpressionField colorCombo;
 
-		/// <summary> 
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.Container components = null;
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.Container components = null;
 
-		public LineStyleEditor()
-		{
-			// This call is required by the Windows.Forms Form Designer.
-			InitializeComponent();
+        public LineStyleEditor()
+        {
+            // This call is required by the Windows.Forms Form Designer.
+            InitializeComponent();
 
             fillCombo.Items.Clear();
             fillCombo.Items.AddRange(FeaturePreviewRender.LineStyles);
         }
 
-		/// <summary> 
-		/// Clean up any resources being used.
-		/// </summary>
-		protected override void Dispose( bool disposing )
-		{
-			if( disposing )
-			{
-				if(components != null)
-				{
-					components.Dispose();
-				}
-			}
-			base.Dispose( disposing );
-		}
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (components != null)
+                {
+                    components.Dispose();
+                }
+            }
+            base.Dispose(disposing);
+        }
 
-		#region Component Designer generated code
-		/// <summary> 
-		/// Required method for Designer support - do not modify 
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
+        #region Component Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LineStyleEditor));
             this.fillCombo = new Maestro.Editors.Common.ImageStylePicker();
             this.lblColor = new System.Windows.Forms.Label();
@@ -89,40 +90,40 @@
             this.colorCombo = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField();
             this.panel1.SuspendLayout();
             this.SuspendLayout();
-            // 
+            //
             // fillCombo
-            // 
+            //
             resources.ApplyResources(this.fillCombo, "fillCombo");
             this.fillCombo.DisplayMember = "Name";
             this.fillCombo.Name = "fillCombo";
             this.fillCombo.TextWidth = 40;
             this.fillCombo.ValueMember = "Name";
-            // 
+            //
             // lblColor
-            // 
+            //
             resources.ApplyResources(this.lblColor, "lblColor");
             this.lblColor.Name = "lblColor";
-            // 
+            //
             // lblThickness
-            // 
+            //
             resources.ApplyResources(this.lblThickness, "lblThickness");
             this.lblThickness.Name = "lblThickness";
-            // 
+            //
             // lblFill
-            // 
+            //
             resources.ApplyResources(this.lblFill, "lblFill");
             this.lblFill.Name = "lblFill";
-            // 
+            //
             // displayLine
-            // 
+            //
             this.displayLine.Checked = true;
             this.displayLine.CheckState = System.Windows.Forms.CheckState.Checked;
             resources.ApplyResources(this.displayLine, "displayLine");
             this.displayLine.Name = "displayLine";
             this.displayLine.CheckedChanged += new System.EventHandler(this.displayLine_CheckedChanged);
-            // 
+            //
             // panel1
-            // 
+            //
             this.panel1.Controls.Add(this.thicknessCombo);
             this.panel1.Controls.Add(this.colorCombo);
             this.panel1.Controls.Add(this.fillCombo);
@@ -131,24 +132,24 @@
             this.panel1.Controls.Add(this.lblFill);
             resources.ApplyResources(this.panel1, "panel1");
             this.panel1.Name = "panel1";
-            // 
+            //
             // thicknessCombo
-            // 
+            //
             resources.ApplyResources(this.thicknessCombo, "thicknessCombo");
             this.thicknessCombo.FormattingEnabled = true;
             this.thicknessCombo.Items.AddRange(new object[] {
             resources.GetString("thicknessCombo.Items")});
             this.thicknessCombo.Name = "thicknessCombo";
-            // 
+            //
             // colorCombo
-            // 
+            //
             resources.ApplyResources(this.colorCombo, "colorCombo");
             this.colorCombo.ColorExpression = "";
             this.colorCombo.Name = "colorCombo";
             this.colorCombo.RequestExpressionEditor += new System.EventHandler(this.colorCombo_RequestExpressionEditor);
-            // 
+            //
             // LineStyleEditor
-            // 
+            //
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.displayLine);
             this.Name = "LineStyleEditor";
@@ -157,18 +158,18 @@
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
             this.ResumeLayout(false);
+        }
 
-		}
-		#endregion
+        #endregion Component Designer generated code
 
-		private void LineStyleEditor_Load(object sender, System.EventArgs e)
-		{
-		}
+        private void LineStyleEditor_Load(object sender, System.EventArgs e)
+        {
+        }
 
-		private void displayLine_CheckedChanged(object sender, System.EventArgs e)
-		{
+        private void displayLine_CheckedChanged(object sender, System.EventArgs e)
+        {
             panel1.Enabled = displayLine.Checked;
-		}
+        }
 
         public event EventHandler RequiresExpressionEditor;
 
@@ -184,5 +185,5 @@
             get { return colorCombo.ColorExpression; }
             set { colorCombo.ColorExpression = value; }
         }
-	}
-}
+    }
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,38 +1,37 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Globalization;
-using System.Threading;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
+using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using Maestro.Shared.UI;
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
 {
@@ -65,10 +64,12 @@
         private System.Data.DataTable RotationTable;
         private System.Data.DataColumn dataColumn7;
         private System.Data.DataColumn dataColumn8;
+
         /// <summary>
         /// Required designer variable.
         /// </summary>
         private System.ComponentModel.Container components = null;
+
         private System.Windows.Forms.ComboBox HeightText;
         private System.Windows.Forms.ComboBox WidthText;
         private System.Windows.Forms.ComboBox SizeUnits;
@@ -158,7 +159,7 @@
         {
             get
             {
-                return _mappingSvc != null && _preview != null; 
+                return _mappingSvc != null && _preview != null;
             }
         }
 
@@ -175,7 +176,7 @@
             //
             InitializeComponent();
             //this.AutoScroll = false;
-            using(System.IO.StringReader sr = new System.IO.StringReader(Strings.GeometryStyleComboDataset))
+            using (System.IO.StringReader sr = new System.IO.StringReader(Strings.GeometryStyleComboDataset))
                 ComboBoxDataSet.ReadXml(sr);
 
             fontCombo.Items.Clear();
@@ -187,13 +188,13 @@
             fillStyleEditor.displayFill.CheckedChanged += new EventHandler(displayFill_CheckedChanged);
             fillStyleEditor.fillCombo.SelectedIndexChanged += new EventHandler(fillCombo_SelectedIndexChanged);
             fillStyleEditor.foregroundColor.CurrentColorChanged += new EventHandler(foregroundColor_CurrentColorChanged);
-            fillStyleEditor.backgroundColor.CurrentColorChanged +=new EventHandler(backgroundColor_CurrentColorChanged);
+            fillStyleEditor.backgroundColor.CurrentColorChanged += new EventHandler(backgroundColor_CurrentColorChanged);
 
-            lineStyleEditor.displayLine.CheckedChanged +=new EventHandler(displayLine_CheckedChanged);
+            lineStyleEditor.displayLine.CheckedChanged += new EventHandler(displayLine_CheckedChanged);
             lineStyleEditor.thicknessCombo.SelectedIndexChanged += new EventHandler(thicknessCombo_SelectedIndexChanged);
             lineStyleEditor.thicknessCombo.TextChanged += new EventHandler(thicknessCombo_TextChanged);
-            lineStyleEditor.colorCombo.CurrentColorChanged +=new EventHandler(colorCombo_CurrentColorChanged);
-            lineStyleEditor.fillCombo.SelectedIndexChanged +=new EventHandler(fillCombo_Line_SelectedIndexChanged);
+            lineStyleEditor.colorCombo.CurrentColorChanged += new EventHandler(colorCombo_CurrentColorChanged);
+            lineStyleEditor.fillCombo.SelectedIndexChanged += new EventHandler(fillCombo_Line_SelectedIndexChanged);
         }
 
         private void setUIForMarkSymbol(bool isMark)
@@ -335,7 +336,7 @@
                     MessageBox.Show(this, Strings.SymbolTypeNotSupported, Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Information);
 
                 UpdatePreviewResult();
-            } 
+            }
             finally
             {
                 m_inUpdate = false;
@@ -345,20 +346,20 @@
         /// <summary>
         /// Clean up any resources being used.
         /// </summary>
-        protected override void Dispose( bool disposing )
+        protected override void Dispose(bool disposing)
         {
-            if( disposing )
+            if (disposing)
             {
-                if(components != null)
+                if (components != null)
                 {
                     components.Dispose();
                 }
             }
-            base.Dispose( disposing );
+            base.Dispose(disposing);
         }
 
-
         #region Windows Form Designer generated code
+
         /// <summary>
         /// Required method for Designer support - do not modify
         /// the contents of this method with the code editor.
@@ -449,9 +450,9 @@
             this.TAB_STYLE.SuspendLayout();
             this.TAB_FILL_BORDER.SuspendLayout();
             this.SuspendLayout();
-            // 
+            //
             // groupBox1
-            // 
+            //
             resources.ApplyResources(this.groupBox1, "groupBox1");
             this.groupBox1.Controls.Add(this.RotationBox);
             this.groupBox1.Controls.Add(this.label9);
@@ -467,9 +468,9 @@
             this.groupBox1.Controls.Add(this.label1);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.TabStop = false;
-            // 
+            //
             // RotationBox
-            // 
+            //
             resources.ApplyResources(this.RotationBox, "RotationBox");
             this.RotationBox.DataSource = this.RotationTable;
             this.RotationBox.DisplayMember = "Display";
@@ -477,49 +478,49 @@
             this.RotationBox.ValueMember = "Value";
             this.RotationBox.SelectedIndexChanged += new System.EventHandler(this.RotationBox_SelectedIndexChanged);
             this.RotationBox.TextChanged += new System.EventHandler(this.RotationBox_TextChanged);
-            // 
+            //
             // RotationTable
-            // 
+            //
             this.RotationTable.Columns.AddRange(new System.Data.DataColumn[] {
             this.dataColumn7,
             this.dataColumn8});
             this.RotationTable.TableName = "Rotation";
-            // 
+            //
             // dataColumn7
-            // 
+            //
             this.dataColumn7.Caption = "Display";
             this.dataColumn7.ColumnName = "Display";
-            // 
+            //
             // dataColumn8
-            // 
+            //
             this.dataColumn8.Caption = "Value";
             this.dataColumn8.ColumnName = "Value";
-            // 
+            //
             // label9
-            // 
+            //
             resources.ApplyResources(this.label9, "label9");
             this.label9.Name = "label9";
-            // 
+            //
             // HeightText
-            // 
+            //
             resources.ApplyResources(this.HeightText, "HeightText");
             this.HeightText.Items.AddRange(new object[] {
             resources.GetString("HeightText.Items")});
             this.HeightText.Name = "HeightText";
             this.HeightText.SelectedIndexChanged += new System.EventHandler(this.HeightText_SelectedIndexChanged);
             this.HeightText.TextChanged += new System.EventHandler(this.HeightText_TextChanged);
-            // 
+            //
             // WidthText
-            // 
+            //
             resources.ApplyResources(this.WidthText, "WidthText");
             this.WidthText.Items.AddRange(new object[] {
             resources.GetString("WidthText.Items")});
             this.WidthText.Name = "WidthText";
             this.WidthText.SelectedIndexChanged += new System.EventHandler(this.WidthText_SelectedIndexChanged);
             this.WidthText.TextChanged += new System.EventHandler(this.WidthText_TextChanged);
-            // 
+            //
             // SizeUnits
-            // 
+            //
             resources.ApplyResources(this.SizeUnits, "SizeUnits");
             this.SizeUnits.DataSource = this.UnitsTable;
             this.SizeUnits.DisplayMember = "Display";
@@ -527,26 +528,26 @@
             this.SizeUnits.Name = "SizeUnits";
             this.SizeUnits.ValueMember = "Value";
             this.SizeUnits.SelectedIndexChanged += new System.EventHandler(this.SizeUnits_SelectedIndexChanged);
-            // 
+            //
             // UnitsTable
-            // 
+            //
             this.UnitsTable.Columns.AddRange(new System.Data.DataColumn[] {
             this.dataColumn5,
             this.dataColumn6});
             this.UnitsTable.TableName = "Units";
-            // 
+            //
             // dataColumn5
-            // 
+            //
             this.dataColumn5.Caption = "Display";
             this.dataColumn5.ColumnName = "Display";
-            // 
+            //
             // dataColumn6
-            // 
+            //
             this.dataColumn6.Caption = "Value";
             this.dataColumn6.ColumnName = "Value";
-            // 
+            //
             // SizeContext
-            // 
+            //
             resources.ApplyResources(this.SizeContext, "SizeContext");
             this.SizeContext.DataSource = this.SizeContextTable;
             this.SizeContext.DisplayMember = "Display";
@@ -554,26 +555,26 @@
             this.SizeContext.Name = "SizeContext";
             this.SizeContext.ValueMember = "Value";
             this.SizeContext.SelectedIndexChanged += new System.EventHandler(this.SizeContext_SelectedIndexChanged);
-            // 
+            //
             // SizeContextTable
-            // 
+            //
             this.SizeContextTable.Columns.AddRange(new System.Data.DataColumn[] {
             this.dataColumn3,
             this.dataColumn4});
             this.SizeContextTable.TableName = "SizeContext";
-            // 
+            //
             // dataColumn3
-            // 
+            //
             this.dataColumn3.Caption = "Display";
             this.dataColumn3.ColumnName = "Display";
-            // 
+            //
             // dataColumn4
-            // 
+            //
             this.dataColumn4.Caption = "Value";
             this.dataColumn4.ColumnName = "Value";
-            // 
+            //
             // Symbol
-            // 
+            //
             resources.ApplyResources(this.Symbol, "Symbol");
             this.Symbol.DataSource = this.SymbolMarkTable;
             this.Symbol.DisplayMember = "Display";
@@ -581,104 +582,104 @@
             this.Symbol.Name = "Symbol";
             this.Symbol.ValueMember = "Value";
             this.Symbol.SelectedIndexChanged += new System.EventHandler(this.Symbol_SelectedIndexChanged);
-            // 
+            //
             // SymbolMarkTable
-            // 
+            //
             this.SymbolMarkTable.Columns.AddRange(new System.Data.DataColumn[] {
             this.dataColumn1,
             this.dataColumn2});
             this.SymbolMarkTable.TableName = "SymbolMark";
-            // 
+            //
             // dataColumn1
-            // 
+            //
             this.dataColumn1.Caption = "Display";
             this.dataColumn1.ColumnName = "Display";
-            // 
+            //
             // dataColumn2
-            // 
+            //
             this.dataColumn2.Caption = "Value";
             this.dataColumn2.ColumnName = "Value";
-            // 
+            //
             // label5
-            // 
+            //
             resources.ApplyResources(this.label5, "label5");
             this.label5.Name = "label5";
-            // 
+            //
             // label4
-            // 
+            //
             resources.ApplyResources(this.label4, "label4");
             this.label4.Name = "label4";
-            // 
+            //
             // label3
-            // 
+            //
             resources.ApplyResources(this.label3, "label3");
             this.label3.Name = "label3";
-            // 
+            //
             // label2
-            // 
+            //
             resources.ApplyResources(this.label2, "label2");
             this.label2.Name = "label2";
-            // 
+            //
             // label1
-            // 
+            //
             resources.ApplyResources(this.label1, "label1");
             this.label1.Name = "label1";
-            // 
+            //
             // grpSymbolFill
-            // 
+            //
             resources.ApplyResources(this.grpSymbolFill, "grpSymbolFill");
             this.grpSymbolFill.Controls.Add(this.fillStyleEditor);
             this.grpSymbolFill.Name = "grpSymbolFill";
             this.grpSymbolFill.TabStop = false;
-            // 
+            //
             // fillStyleEditor
-            // 
+            //
             resources.ApplyResources(this.fillStyleEditor, "fillStyleEditor");
             this.fillStyleEditor.Name = "fillStyleEditor";
             this.fillStyleEditor.ForegroundRequiresExpression += new System.EventHandler(this.FillStyleEditor_ForegroundRequiresExpression);
             this.fillStyleEditor.BackgroundRequiresExpression += new System.EventHandler(this.FillStyleEditor_BackgroundRequiresExpression);
-            // 
+            //
             // grpSymbolBorder
-            // 
+            //
             resources.ApplyResources(this.grpSymbolBorder, "grpSymbolBorder");
             this.grpSymbolBorder.Controls.Add(this.lineStyleEditor);
             this.grpSymbolBorder.Name = "grpSymbolBorder";
             this.grpSymbolBorder.TabStop = false;
-            // 
+            //
             // lineStyleEditor
-            // 
+            //
             this.lineStyleEditor.ColorExpression = "";
             resources.ApplyResources(this.lineStyleEditor, "lineStyleEditor");
             this.lineStyleEditor.Name = "lineStyleEditor";
             this.lineStyleEditor.RequiresExpressionEditor += new System.EventHandler(this.LineStyleEditor_RequiresExpressionEditor);
-            // 
+            //
             // groupBox4
-            // 
+            //
             resources.ApplyResources(this.groupBox4, "groupBox4");
             this.groupBox4.Controls.Add(this.lnkRefresh);
             this.groupBox4.Controls.Add(this.previewPicture);
             this.groupBox4.Name = "groupBox4";
             this.groupBox4.TabStop = false;
-            // 
+            //
             // lnkRefresh
-            // 
+            //
             resources.ApplyResources(this.lnkRefresh, "lnkRefresh");
             this.lnkRefresh.BackColor = System.Drawing.Color.Transparent;
             this.lnkRefresh.Name = "lnkRefresh";
             this.lnkRefresh.TabStop = true;
             this.lnkRefresh.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkRefresh_LinkClicked);
-            // 
+            //
             // previewPicture
-            // 
+            //
             resources.ApplyResources(this.previewPicture, "previewPicture");
             this.previewPicture.BackColor = System.Drawing.Color.White;
             this.previewPicture.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.previewPicture.Name = "previewPicture";
             this.previewPicture.TabStop = false;
             this.previewPicture.Paint += new System.Windows.Forms.PaintEventHandler(this.previewPicture_Paint);
-            // 
+            //
             // ComboBoxDataSet
-            // 
+            //
             this.ComboBoxDataSet.DataSetName = "ComboBoxDataSet";
             this.ComboBoxDataSet.Locale = new System.Globalization.CultureInfo("da-DK");
             this.ComboBoxDataSet.Tables.AddRange(new System.Data.DataTable[] {
@@ -686,18 +687,18 @@
             this.SizeContextTable,
             this.UnitsTable,
             this.RotationTable});
-            // 
+            //
             // DisplayPoints
-            // 
+            //
             resources.ApplyResources(this.DisplayPoints, "DisplayPoints");
             this.DisplayPoints.Checked = true;
             this.DisplayPoints.CheckState = System.Windows.Forms.CheckState.Checked;
             this.DisplayPoints.Name = "DisplayPoints";
             this.DisplayPoints.UseVisualStyleBackColor = true;
             this.DisplayPoints.CheckedChanged += new System.EventHandler(this.DisplayPoints_CheckedChanged);
-            // 
+            //
             // groupBoxFont
-            // 
+            //
             resources.ApplyResources(this.groupBoxFont, "groupBoxFont");
             this.groupBoxFont.Controls.Add(this.label11);
             this.groupBoxFont.Controls.Add(this.colorFontForeground);
@@ -708,26 +709,26 @@
             this.groupBoxFont.Controls.Add(this.label10);
             this.groupBoxFont.Name = "groupBoxFont";
             this.groupBoxFont.TabStop = false;
-            // 
+            //
             // label11
-            // 
+            //
             resources.ApplyResources(this.label11, "label11");
             this.label11.Name = "label11";
-            // 
+            //
             // colorFontForeground
-            // 
+            //
             resources.ApplyResources(this.colorFontForeground, "colorFontForeground");
             this.colorFontForeground.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
             this.colorFontForeground.Name = "colorFontForeground";
-            // 
+            //
             // panel1
-            // 
+            //
             this.panel1.Controls.Add(this.toolStrip1);
             resources.ApplyResources(this.panel1, "panel1");
             this.panel1.Name = "panel1";
-            // 
+            //
             // toolStrip1
-            // 
+            //
             this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.FontBoldButton,
@@ -736,60 +737,60 @@
             resources.ApplyResources(this.toolStrip1, "toolStrip1");
             this.toolStrip1.Name = "toolStrip1";
             this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
-            // 
+            //
             // FontBoldButton
-            // 
+            //
             this.FontBoldButton.CheckOnClick = true;
             this.FontBoldButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
             resources.ApplyResources(this.FontBoldButton, "FontBoldButton");
             this.FontBoldButton.Name = "FontBoldButton";
             this.FontBoldButton.Click += new System.EventHandler(this.FontBoldButton_Click);
-            // 
+            //
             // FontItalicButton
-            // 
+            //
             this.FontItalicButton.CheckOnClick = true;
             this.FontItalicButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
             resources.ApplyResources(this.FontItalicButton, "FontItalicButton");
             this.FontItalicButton.Name = "FontItalicButton";
             this.FontItalicButton.Click += new System.EventHandler(this.FontItalicButton_Click);
-            // 
+            //
             // FontUnderlineButton
-            // 
+            //
             this.FontUnderlineButton.CheckOnClick = true;
             this.FontUnderlineButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
             resources.ApplyResources(this.FontUnderlineButton, "FontUnderlineButton");
             this.FontUnderlineButton.Name = "FontUnderlineButton";
             this.FontUnderlineButton.Click += new System.EventHandler(this.FontUnderlineButton_Click);
-            // 
+            //
             // lblForeground
-            // 
+            //
             resources.ApplyResources(this.lblForeground, "lblForeground");
             this.lblForeground.Name = "lblForeground";
-            // 
+            //
             // comboBoxCharacter
-            // 
+            //
             resources.ApplyResources(this.comboBoxCharacter, "comboBoxCharacter");
             this.comboBoxCharacter.DisplayMember = "Display";
             this.comboBoxCharacter.Name = "comboBoxCharacter";
             this.comboBoxCharacter.ValueMember = "Value";
             this.comboBoxCharacter.SelectedIndexChanged += new System.EventHandler(this.comboBoxCharacter_SelectedIndexChanged);
             this.comboBoxCharacter.TextChanged += new System.EventHandler(this.comboBoxCharacter_TextChanged);
-            // 
+            //
             // fontCombo
-            // 
+            //
             resources.ApplyResources(this.fontCombo, "fontCombo");
             this.fontCombo.DisplayMember = "Display";
             this.fontCombo.Name = "fontCombo";
             this.fontCombo.ValueMember = "Value";
             this.fontCombo.SelectedIndexChanged += new System.EventHandler(this.fontCombo_SelectedIndexChanged);
-            // 
+            //
             // label10
-            // 
+            //
             resources.ApplyResources(this.label10, "label10");
             this.label10.Name = "label10";
-            // 
+            //
             // groupBoxSymbolLocation
-            // 
+            //
             resources.ApplyResources(this.groupBoxSymbolLocation, "groupBoxSymbolLocation");
             this.groupBoxSymbolLocation.Controls.Add(this.button1);
             this.groupBoxSymbolLocation.Controls.Add(this.ReferenceY);
@@ -800,44 +801,44 @@
             this.groupBoxSymbolLocation.Controls.Add(this.MaintainAspectRatio);
             this.groupBoxSymbolLocation.Name = "groupBoxSymbolLocation";
             this.groupBoxSymbolLocation.TabStop = false;
-            // 
+            //
             // button1
-            // 
+            //
             resources.ApplyResources(this.button1, "button1");
             this.button1.Name = "button1";
-            // 
+            //
             // ReferenceY
-            // 
+            //
             resources.ApplyResources(this.ReferenceY, "ReferenceY");
             this.ReferenceY.Name = "ReferenceY";
-            // 
+            //
             // label8
-            // 
+            //
             resources.ApplyResources(this.label8, "label8");
             this.label8.Name = "label8";
-            // 
+            //
             // ReferenceX
-            // 
+            //
             resources.ApplyResources(this.ReferenceX, "ReferenceX");
             this.ReferenceX.Name = "ReferenceX";
-            // 
+            //
             // label7
-            // 
+            //
             resources.ApplyResources(this.label7, "label7");
             this.label7.Name = "label7";
-            // 
+            //
             // label6
-            // 
+            //
             resources.ApplyResources(this.label6, "label6");
             this.label6.Name = "label6";
-            // 
+            //
             // MaintainAspectRatio
-            // 
+            //
             resources.ApplyResources(this.MaintainAspectRatio, "MaintainAspectRatio");
             this.MaintainAspectRatio.Name = "MaintainAspectRatio";
-            // 
+            //
             // grpW2DStyle
-            // 
+            //
             resources.ApplyResources(this.grpW2DStyle, "grpW2DStyle");
             this.grpW2DStyle.Controls.Add(this.chkW2DTextColor);
             this.grpW2DStyle.Controls.Add(this.cmbW2DTextColor);
@@ -847,59 +848,59 @@
             this.grpW2DStyle.Controls.Add(this.cmbW2DFillColor);
             this.grpW2DStyle.Name = "grpW2DStyle";
             this.grpW2DStyle.TabStop = false;
-            // 
+            //
             // chkW2DTextColor
-            // 
+            //
             resources.ApplyResources(this.chkW2DTextColor, "chkW2DTextColor");
             this.chkW2DTextColor.Name = "chkW2DTextColor";
             this.chkW2DTextColor.UseVisualStyleBackColor = true;
             this.chkW2DTextColor.CheckedChanged += new System.EventHandler(this.chkW2DTextColor_CheckedChanged);
-            // 
+            //
             // cmbW2DTextColor
-            // 
+            //
             resources.ApplyResources(this.cmbW2DTextColor, "cmbW2DTextColor");
             this.cmbW2DTextColor.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
             this.cmbW2DTextColor.Name = "cmbW2DTextColor";
             this.cmbW2DTextColor.CurrentColorChanged += new System.EventHandler(this.cmbW2DTextColor_SelectedIndexChanged);
-            // 
+            //
             // chkW2DLineColor
-            // 
+            //
             resources.ApplyResources(this.chkW2DLineColor, "chkW2DLineColor");
             this.chkW2DLineColor.Name = "chkW2DLineColor";
             this.chkW2DLineColor.UseVisualStyleBackColor = true;
             this.chkW2DLineColor.CheckedChanged += new System.EventHandler(this.chkW2DLineColor_CheckedChanged);
-            // 
+            //
             // cmbW2DLineColor
-            // 
+            //
             resources.ApplyResources(this.cmbW2DLineColor, "cmbW2DLineColor");
             this.cmbW2DLineColor.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
             this.cmbW2DLineColor.Name = "cmbW2DLineColor";
             this.cmbW2DLineColor.CurrentColorChanged += new System.EventHandler(this.cmbW2DLineColor_SelectedIndexChanged);
-            // 
+            //
             // chkW2DFillColor
-            // 
+            //
             resources.ApplyResources(this.chkW2DFillColor, "chkW2DFillColor");
             this.chkW2DFillColor.Name = "chkW2DFillColor";
             this.chkW2DFillColor.UseVisualStyleBackColor = true;
             this.chkW2DFillColor.CheckedChanged += new System.EventHandler(this.chkW2DFillColor_CheckedChanged);
-            // 
+            //
             // cmbW2DFillColor
-            // 
+            //
             resources.ApplyResources(this.cmbW2DFillColor, "cmbW2DFillColor");
             this.cmbW2DFillColor.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
             this.cmbW2DFillColor.Name = "cmbW2DFillColor";
             this.cmbW2DFillColor.CurrentColorChanged += new System.EventHandler(this.cmbW2DFillColor_SelectedIndexChanged);
-            // 
+            //
             // tabControl1
-            // 
+            //
             resources.ApplyResources(this.tabControl1, "tabControl1");
             this.tabControl1.Controls.Add(this.TAB_STYLE);
             this.tabControl1.Controls.Add(this.TAB_FILL_BORDER);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
-            // 
+            //
             // TAB_STYLE
-            // 
+            //
             this.TAB_STYLE.Controls.Add(this.groupBox1);
             this.TAB_STYLE.Controls.Add(this.grpW2DStyle);
             this.TAB_STYLE.Controls.Add(this.groupBoxFont);
@@ -907,17 +908,17 @@
             resources.ApplyResources(this.TAB_STYLE, "TAB_STYLE");
             this.TAB_STYLE.Name = "TAB_STYLE";
             this.TAB_STYLE.UseVisualStyleBackColor = true;
-            // 
+            //
             // TAB_FILL_BORDER
-            // 
+            //
             this.TAB_FILL_BORDER.Controls.Add(this.grpSymbolFill);
             this.TAB_FILL_BORDER.Controls.Add(this.grpSymbolBorder);
             resources.ApplyResources(this.TAB_FILL_BORDER, "TAB_FILL_BORDER");
             this.TAB_FILL_BORDER.Name = "TAB_FILL_BORDER";
             this.TAB_FILL_BORDER.UseVisualStyleBackColor = true;
-            // 
+            //
             // PointFeatureStyleEditor
-            // 
+            //
             resources.ApplyResources(this, "$this");
             this.Controls.Add(this.tabControl1);
             this.Controls.Add(this.DisplayPoints);
@@ -951,10 +952,10 @@
             this.TAB_FILL_BORDER.ResumeLayout(false);
             this.ResumeLayout(false);
             this.PerformLayout();
-
         }
-        #endregion
 
+        #endregion Windows Form Designer generated code
+
         private void PointFeatureStyleEditor_Load(object sender, System.EventArgs e)
         {
             UpdateDisplay();
@@ -1033,7 +1034,7 @@
 
                 m_lastMark.Shape = selectedShape;
                 m_item.Symbol = m_lastMark;
-                
+
                 setUIForMarkSymbol(true);
                 if (update)
                     UpdateDisplay();
@@ -1140,7 +1141,7 @@
                 if (!userChange)
                     m_inUpdate = true;
                 owner.SelectedIndex = -1;
-                
+
                 //HACK: Odd bug, don't remove
                 if (owner.SelectedIndex != -1)
                     owner.SelectedIndex = -1;
@@ -1218,7 +1219,7 @@
                 else
                     m_item.Symbol.InsertionPointX = ReferenceX.Text;
             }
-            UpdatePreviewResult();		
+            UpdatePreviewResult();
             if (Changed != null)
                 Changed(this, new EventArgs());
         }
@@ -1236,7 +1237,7 @@
                 else
                     m_item.Symbol.InsertionPointY = "0.5";
             }
-            UpdatePreviewResult();		
+            UpdatePreviewResult();
             if (Changed != null)
                 Changed(this, new EventArgs());
         }
@@ -1271,7 +1272,6 @@
                 //RotationBox.SelectedIndex = -1;
                 UpdatePreviewResult();
             }
-
         }
 
         private void displayFill_CheckedChanged(object sender, EventArgs e)
@@ -1322,7 +1322,7 @@
                 return;
 
             if (m_item.Symbol.Type == PointSymbolType.Mark)
-                ((IMarkSymbol) m_item.Symbol).Fill.FillPattern = fillStyleEditor.fillCombo.Text;
+                ((IMarkSymbol)m_item.Symbol).Fill.FillPattern = fillStyleEditor.fillCombo.Text;
             UpdatePreviewResult();
             if (Changed != null)
                 Changed(this, new EventArgs());
@@ -1352,7 +1352,6 @@
                 Changed(this, new EventArgs());
         }
 
-
         private void thicknessCombo_TextChanged(object sender, EventArgs e)
         {
             if (m_inUpdate || lineStyleEditor.thicknessCombo.SelectedIndex != -1)
@@ -1475,11 +1474,10 @@
             comboBoxCharacter_SelectedIndexChanged(sender, e);
         }
 
-
         public IPointSymbolization2D Item
         {
             get { return m_item; }
-            set 
+            set
             {
                 m_item = value;
                 UpdateDisplay();
@@ -1509,12 +1507,12 @@
             UpdatePreviewResult();
         }
 
-        static string DoubleToString(double? value)
+        private static string DoubleToString(double? value)
         {
             return value.HasValue ? value.Value.ToString() : null;
         }
 
-        static double? StringToDouble(string value)
+        private static double? StringToDouble(string value)
         {
             double d;
             if (double.TryParse(value, out d))
@@ -1569,7 +1567,7 @@
             if (Changed != null)
                 Changed(this, new EventArgs());
         }
-        
+
         private void ReferenceY_Leave(object sender, EventArgs e)
         {
             double d;
@@ -1628,8 +1626,8 @@
 
         internal void SetupForTheming()
         {
-            fillStyleEditor.foregroundColor.Enabled = 
-            lineStyleEditor.lblColor.Enabled = 
+            fillStyleEditor.foregroundColor.Enabled =
+            lineStyleEditor.lblColor.Enabled =
             colorFontForeground.Enabled =
             lblForeground.Enabled =
             DisplayPoints.Enabled =
@@ -1760,8 +1758,8 @@
             if (Changed != null)
                 Changed(this, new EventArgs());
         }
-        
-        void FillStyleEditor_BackgroundRequiresExpression(object sender, EventArgs e)
+
+        private void FillStyleEditor_BackgroundRequiresExpression(object sender, EventArgs e)
         {
             string expr = m_editor.EditExpression(fillStyleEditor.backgroundColor.ColorExpression, m_schema, m_providername, m_featureSource, true);
             if (expr != null)
@@ -1770,8 +1768,8 @@
                 UpdatePreviewResult();
             }
         }
-        
-        void FillStyleEditor_ForegroundRequiresExpression(object sender, EventArgs e)
+
+        private void FillStyleEditor_ForegroundRequiresExpression(object sender, EventArgs e)
         {
             string expr = m_editor.EditExpression(fillStyleEditor.foregroundColor.ColorExpression, m_schema, m_providername, m_featureSource, true);
             if (expr != null)
@@ -1780,8 +1778,8 @@
                 UpdatePreviewResult();
             }
         }
-        
-        void LineStyleEditor_RequiresExpressionEditor(object sender, EventArgs e)
+
+        private void LineStyleEditor_RequiresExpressionEditor(object sender, EventArgs e)
         {
             string expr = m_editor.EditExpression(lineStyleEditor.colorCombo.ColorExpression, m_schema, m_providername, m_featureSource, true);
             if (expr != null)
@@ -1816,4 +1814,4 @@
             UpdatePreviewResult();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ScaleRangeEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ScaleRangeEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ScaleRangeEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,81 +1,79 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
-using System;
-using System.Collections;
+//
+
+#endregion Disclaimer / License
+
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Windows.Forms;
 
 namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
 {
-	/// <summary>
-	/// Summary description for ScaleRangeEditor.
-	/// </summary>
+    /// <summary>
+    /// Summary description for ScaleRangeEditor.
+    /// </summary>
     [ToolboxItem(false)]
-	internal class ScaleRangeEditor : System.Windows.Forms.UserControl
-	{
-		/// <summary> 
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.Container components = null;
+    internal class ScaleRangeEditor : System.Windows.Forms.UserControl
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.Container components = null;
 
-		public ScaleRangeEditor()
-		{
-			// This call is required by the Windows.Forms Form Designer.
-			InitializeComponent();
+        public ScaleRangeEditor()
+        {
+            // This call is required by the Windows.Forms Form Designer.
+            InitializeComponent();
 
-			// TODO: Add any initialization after the InitializeComponent call
+            // TODO: Add any initialization after the InitializeComponent call
+        }
 
-		}
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (components != null)
+                {
+                    components.Dispose();
+                }
+            }
+            base.Dispose(disposing);
+        }
 
-		/// <summary> 
-		/// Clean up any resources being used.
-		/// </summary>
-		protected override void Dispose( bool disposing )
-		{
-			if( disposing )
-			{
-				if(components != null)
-				{
-					components.Dispose();
-				}
-			}
-			base.Dispose( disposing );
-		}
+        #region Component Designer generated code
 
-		#region Component Designer generated code
-		/// <summary> 
-		/// Required method for Designer support - do not modify 
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
             this.SuspendLayout();
-            // 
+            //
             // ScaleRangeEditor
-            // 
+            //
             this.Name = "ScaleRangeEditor";
             this.ResumeLayout(false);
+        }
 
-		}
-		#endregion
-	}
-}
+        #endregion Component Designer generated code
+    }
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/StyleImageCache.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/StyleImageCache.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/StyleImageCache.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
 using System.Collections.Generic;
-using System.Text;
 using System.Reflection;
-using Maestro.Editors.Common;
 
 namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
 {
@@ -61,7 +62,7 @@
             }
         }
 
-        static int CompareImages(ImageStylePicker.NamedImage x, ImageStylePicker.NamedImage y)
+        private static int CompareImages(ImageStylePicker.NamedImage x, ImageStylePicker.NamedImage y)
         {
             return x.Name.CompareTo(y.Name);
         }
@@ -93,4 +94,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ColorBrewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ColorBrewer.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ColorBrewer.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace Maestro.Editors.LayerDefinition.Vector.Thematics
 {
@@ -36,12 +38,14 @@
         /// Gets the name of the ColorBrewer set
         /// </summary>
         public string Name { get { return m_name; } }
+
         /*
         /// <summary>
         /// Gets the assigned type for the ColorBrewer set
         /// </summary>
         public string Type { get { return m_type; } }
          */
+
         /// <summary>
         /// Gets the ordered list of colors to use
         /// </summary>
@@ -116,13 +120,13 @@
                 {
                     string line = sr.ReadLine();
                     List<string> values = TokenizeLine(line, recordDelimiter, textDelimiter);
-                    
+
                     if (values.Count != columns.Count)
                         throw new Exception(string.Format(Strings.InvalidFieldCountError, line));
 
                     string colorName = values[columns["ColorName"]];
                     string type = values[columns["Type"]];
-                    
+
                     if (string.IsNullOrEmpty(colorName) || string.IsNullOrEmpty(type))
                         continue; //Assume comment
 
@@ -139,7 +143,7 @@
                             values = TokenizeLine(line, recordDelimiter, textDelimiter);
                             if (values.Count != colnames.Count)
                                 throw new Exception(string.Format(Strings.InvalidRecordCountError, line));
-                            
+
                             byte r, g, b;
                             if (!byte.TryParse(values[columns["R"]], out r))
                                 throw new Exception(string.Format(Strings.InvalidColorComponent, "R", values[columns["R"]], line));
@@ -191,7 +195,7 @@
                     if (rec.StartsWith(textDelimiter.ToString()) && rec.EndsWith(textDelimiter.ToString()))
                         rec = rec.Substring(1, rec.Length - 2);
                     records.Add(rec);
-                    startIndex = i+1;
+                    startIndex = i + 1;
                 }
 
             if (startIndex <= line.Length)
@@ -202,7 +206,7 @@
 
                 records.Add(rec);
             }
-            
+
             return records;
         }
 
@@ -226,10 +230,13 @@
                 {
                     case "qual":
                         return Strings.QualitativeName;
+
                     case "seq":
                         return Strings.SequentialName;
+
                     case "div":
                         return Strings.DivergingName;
+
                     default:
                         return m_type;
                 }
@@ -250,10 +257,12 @@
                 /// Displays "Group - Name"
                 /// </summary>
                 Full,
+
                 /// <summary>
                 /// Just display the group
                 /// </summary>
                 Type,
+
                 /// <summary>
                 /// Just display the set name
                 /// </summary>
@@ -301,4 +310,4 @@
             this.Colors.Reverse();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,46 +1,42 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.IO;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
-using Maestro.Editors.LayerDefinition.Vector.Scales;
-using Maestro.Editors.LayerDefinition.Vector.StyleEditors;
+using Maestro.Editors.Generic;
+using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using Ldf = OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using OSGeo.MapGuide.MaestroAPI.Schema;
-using System.Collections.Specialized;
-using Maestro.Editors.Generic;
-using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-using OSGeo.MapGuide.MaestroAPI.Services;
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Diagnostics;
+using System.Drawing;
+using System.IO;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.LayerDefinition.Vector.Thematics
 {
@@ -48,10 +44,10 @@
     {
         private const int PREVIEW_ITEM_BOX_WIDTH = 20;
         private const int PREVIEW_ITEM_BOX_SPACING = 10;
-        const int MAX_NUMERIC_THEME_RULES = 100000;
-        const int MAX_INDIVIDUAL_THEME_RULES = 100;
-        const int THEME_RULE_WARNING_LIMIT = 1000;
-        const int THEME_RULE_EXPRESSION_WARNING_LIMIT = 20;
+        private const int MAX_NUMERIC_THEME_RULES = 100000;
+        private const int MAX_INDIVIDUAL_THEME_RULES = 100;
+        private const int THEME_RULE_WARNING_LIMIT = 1000;
+        private const int THEME_RULE_EXPRESSION_WARNING_LIMIT = 20;
 
         private static List<ColorBrewer> m_colorBrewer;
 
@@ -61,7 +57,7 @@
         private Dictionary<object, long> m_values;
         private DataPropertyType m_dataType;
 
-        class LookupPair
+        private class LookupPair
         {
             public object Key;
             public object Value;
@@ -91,14 +87,14 @@
             public string IndividualValue;
         }
 
-        static ThemeCreator ()
+        static ThemeCreator()
         {
             NUMERIC_TYPES = new Type[] { typeof(byte), typeof(int), typeof(float), typeof(double) };
         }
 
         private ILayerElementFactory _factory;
 
-        enum ThemeSource
+        private enum ThemeSource
         {
             LayerDefinition,
             ExpressionEditor
@@ -171,7 +167,6 @@
                             args.Graphics.FillRectangle(b, area);
                         args.Graphics.DrawRectangle(Pens.Black, area);
                     }
-
                 }
 
                 if (args.State == DrawItemState.Selected)
@@ -183,7 +178,6 @@
                 return false;
         }
 
-
         private ThemeCreator()
         {
             InitializeComponent();
@@ -310,7 +304,7 @@
                                                     m_featureClass.QualifiedName,
                                                     filter,
                                                     new NameValueCollection() {
-                                                        { "value", "UNIQUE(\"" + col.Name + "\")" } 
+                                                        { "value", "UNIQUE(\"" + col.Name + "\")" }
                                                     }))
                             {
                                 while (rd.ReadNext() && m_values.Count < MAX_NUMERIC_THEME_RULES) //No more than 100.000 records in memory
@@ -329,7 +323,6 @@
                         }
                         catch
                         {
-
                             using (var rd = m_editor.CurrentConnection.FeatureService.QueryFeatureSource(fsId, m_featureClass.QualifiedName, filter, new string[] { col.Name }))
                             {
                                 while (rd.ReadNext() && m_values.Count < MAX_NUMERIC_THEME_RULES) //No more than 100.000 records in memory
@@ -347,7 +340,6 @@
                             }
                         }
                         rawEx = null; //Clear error
-
                     }
                     catch (Exception ex)
                     {
@@ -406,7 +398,6 @@
                             if (AggregateCombo.SelectedIndex == AggregateCombo.Items.Count - 1)
                                 AggregateCombo.SelectedIndex = 0;
                         }
-
                     }
                     else //String type
                     {
@@ -579,7 +570,6 @@
                             string.Format(System.Globalization.CultureInfo.InvariantCulture, "\"{0}\" >= {1}", ColumnCombo.Text, FormatValue(lower + (dev * (colors.Length - 1)))),
                             string.Format(System.Globalization.CultureInfo.InvariantCulture, Strings.MoreThanLabel, FormatValue(lower + (dev * (colors.Length - 1)))),
                             colors[colors.Length - 1]));
-
                     }
                     else if (AggregateCombo.SelectedIndex == 2) //Quantile
                     {
@@ -708,12 +698,10 @@
             Bitmap bmp = new Bitmap(PreviewPicture.Width, PreviewPicture.Height);
             using (Graphics g = Graphics.FromImage(bmp))
             {
-
                 List<Color?> colors = new List<Color?>();
                 Color[] actualColors = BuildColorSet(true);
                 if (actualColors.Length > 0)
                 {
-
                     int num_boxes = (bmp.Width - PREVIEW_ITEM_BOX_SPACING) / (PREVIEW_ITEM_BOX_WIDTH + PREVIEW_ITEM_BOX_SPACING);
                     if (actualColors.Length > num_boxes)
                     {
@@ -799,7 +787,6 @@
                         Math.Min(255, Math.Max(0, (int)(startColor.G + Math.Round(i * stepG)))),
                         Math.Min(255, Math.Max(0, (int)(startColor.B + Math.Round(i * stepB))))
                     );
-
             }
             else
             {
@@ -849,7 +836,6 @@
                 RuleCount.Minimum = 3;
             }
 
-
             RefreshPreview();
         }
 
@@ -983,27 +969,28 @@
                 this.DialogResult = DialogResult.OK;
                 this.Close();
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 string msg = NestedExceptionMessageProcessor.GetFullMessage(ex);
                 //m_editor.SetLastException(ex);
-                MessageBox.Show(this, string.Format(Strings.GenericError, msg), Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error); 
+                MessageBox.Show(this, string.Format(Strings.GenericError, msg), Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
 
         private static ISymbolDefinitionBase GetSymbolFromReference(IResourceService resSvc, ISymbolInstanceReference symRef)
         {
-            switch(symRef.Type)
+            switch (symRef.Type)
             {
                 case SymbolInstanceType.Inline:
                     return ((ISymbolInstanceReferenceInline)symRef).SymbolDefinition;
+
                 case SymbolInstanceType.Reference:
                     return (ISymbolDefinitionBase)resSvc.GetResource(((ISymbolInstanceReferenceLibrary)symRef).ResourceId);
             }
             return null;
         }
 
-        enum FillColorSource
+        private enum FillColorSource
         {
             PathFillColor,
             SymbolParameterFillColorDefaultValue,
@@ -1203,10 +1190,10 @@
         private void IdentifyColorSource(ICompositeRule template, ref FillColorSource? source, ref string fillAlpha)
         {
             // FIXME: This is very naive. It will identify the first color it finds and runs with it.
-            // It doesn't take into consideration things such as usage contexts, which we currently only care about on 
-            // the 2nd pass when we still can't identify a color and presumably we're dealing with a composite symbolization 
+            // It doesn't take into consideration things such as usage contexts, which we currently only care about on
+            // the 2nd pass when we still can't identify a color and presumably we're dealing with a composite symbolization
             // with line usage (where fill colors won't exist most of the time). Thematics should be fine on the most basic
-            // of composite symbolization cases, but I expect this process to break down hardcore on the most elaborate of 
+            // of composite symbolization cases, but I expect this process to break down hardcore on the most elaborate of
             // composite symbolization cases. Still, some thematic support is better than none.
 
             // So anyways, 1st pass: Assume point/area and identify the first fill color we find
@@ -1664,12 +1651,13 @@
             if (!string.IsNullOrEmpty(txtFilter.Text))
                 filter = txtFilter.Text;
 
-            BusyWaitDialog.Run(Strings.ComputingThemeParameters, 
-            () => { //Worker method
+            BusyWaitDialog.Run(Strings.ComputingThemeParameters,
+            () =>
+            { //Worker method
                 List<LookupPair> res = new List<LookupPair>();
                 using (var reader = m_editor.CurrentConnection.FeatureService.QueryFeatureSource(fsId, className, filter, new string[] { key, value }))
                 {
-                    while(reader.ReadNext())
+                    while (reader.ReadNext())
                     {
                         if (!reader.IsNull(key) && !reader.IsNull(value))
                         {
@@ -1684,7 +1672,8 @@
                 }
                 return res;
             },
-            (res, ex) => { //Worker completion
+            (res, ex) =>
+            { //Worker completion
                 if (ex != null)
                 {
                     ErrorDialog.Show(ex);
@@ -1763,4 +1752,4 @@
             RefreshPreview();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,37 +1,37 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using Maestro.Editors.Generic;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
+using System.Diagnostics;
 using System.Windows.Forms;
-using Maestro.Shared.UI;
-using System.Diagnostics;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Generic;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 
 namespace Maestro.Editors.LayerDefinition.Vector
 {
@@ -82,7 +82,8 @@
                     txtFeatureSource.Text = _vl.ResourceId;
                     string featureClass = txtFeatureClass.Text;
                     string geometry = txtGeometry.Text;
-                    BusyWaitDialog.Run(null, () => {
+                    BusyWaitDialog.Run(null, () =>
+                    {
                         var errors = new List<string>();
                         if (!_edsvc.CurrentConnection.ResourceService.ResourceExists(_vl.ResourceId))
                         {
@@ -117,7 +118,8 @@
                             }
                         }
                         return errors;
-                    }, (result, ex) => {
+                    }, (result, ex) =>
+                    {
                         if (ex != null)
                         {
                             ErrorDialog.Show(ex);
@@ -149,7 +151,7 @@
                                 MessageBox.Show(Strings.LayerEditorHasErrors);
                             }
                         }
-                    });   
+                    });
                 }
 
                 txtFilter.Text = _vl.Filter;
@@ -198,7 +200,7 @@
             }
         }
 
-        void OnVectorLayerPropertyChanged(object sender, PropertyChangedEventArgs e)
+        private void OnVectorLayerPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             OnResourceChanged();
         }
@@ -491,4 +493,4 @@
             errorProvider.SetError(txtFeatureSource, null);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,38 +1,36 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using Maestro.Editors.LayerDefinition.Vector.GridEditor;
+using Maestro.Editors.LayerDefinition.Vector.Scales;
+using Maestro.Editors.LayerDefinition.Vector.StyleEditors;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using System.Collections;
-using Maestro.Editors.Common;
 using System.Globalization;
-using Maestro.Editors.LayerDefinition.Vector.Scales;
-using Maestro.Editors.LayerDefinition.Vector.StyleEditors;
-using Maestro.Editors.LayerDefinition.Vector.GridEditor;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.LayerDefinition.Vector
 {
@@ -132,7 +130,7 @@
             }
         }
 
-        class VectorScaleRange : INotifyPropertyChanged
+        private class VectorScaleRange : INotifyPropertyChanged
         {
             public IVectorScaleRange Item { get; set; }
 
@@ -246,7 +244,6 @@
         {
             _scales.Add(vsc);
             _vl.AddVectorScaleRange(vsc.Item);
-            
         }
 
         private void EvaluateCommands()
@@ -391,12 +388,10 @@
 
         private void toolStrip1_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
         {
-
         }
 
         private void groupBox1_Enter(object sender, EventArgs e)
         {
-
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,15 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.MaestroAPI;
+using Maestro.Editors.WatermarkDefinition;
 using OSGeo.MapGuide.MaestroAPI.Schema;
-using Maestro.Editors.WatermarkDefinition;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using System;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.LayerDefinition
 {
@@ -28,7 +22,7 @@
             layerStyles.Owner = this;
         }
 
-        void OnFeatureClassChanged(object sender, EventArgs e)
+        private void OnFeatureClassChanged(object sender, EventArgs e)
         {
             layerProperties.PopulatePropertyList();
         }
@@ -101,7 +95,6 @@
 
         internal void UpdateDisplay()
         {
-            
         }
 
         internal void HasChanged()
@@ -111,10 +104,12 @@
 
         internal void SetLastException(Exception ex)
         {
-            
         }
 
-        internal void FlagDirty() { OnResourceChanged(); }
+        internal void FlagDirty()
+        {
+            OnResourceChanged();
+        }
 
         internal string GetFdoProvider()
         {
@@ -132,4 +127,4 @@
             get { return resSettings.FeatureSourceID; }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/DwfTransformationCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/DwfTransformationCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/DwfTransformationCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.LoadProcedure;
 using Maestro.Shared.UI;
+using OSGeo.MapGuide.ObjectModels.LoadProcedure;
+using System;
+using System.ComponentModel;
 
 namespace Maestro.Editors.LoadProcedure
 {
@@ -60,4 +58,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/ExecuteCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/ExecuteCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/ExecuteCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.LoadProcedure
@@ -44,4 +43,4 @@
                 handler(this, EventArgs.Empty);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/InputFilesCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/InputFilesCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/InputFilesCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.ObjectModels.LoadProcedure;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
+using System.Diagnostics;
 using System.Windows.Forms;
-using Maestro.Shared.UI;
-using System.Diagnostics;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.LoadProcedure;
 
 namespace Maestro.Editors.LoadProcedure
 {
@@ -104,4 +104,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/LoadProcedureEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/LoadProcedureEditorCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/LoadProcedureEditorCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,39 +1,38 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.ObjectModels.LoadProcedure;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.LoadProcedure;
 using System.Diagnostics;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI.Commands;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.LoadProcedure
 {
     /// <summary>
     /// Editor control for Load Procedures
     /// </summary>
-    public partial class LoadProcedureEditorCtrl : EditorBase 
+    public partial class LoadProcedureEditorCtrl : EditorBase
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LoadProcedureEditorCtrl"/> class.
@@ -56,7 +55,7 @@
             _ed = service;
             _lp = _ed.GetEditedResource() as OSGeo.MapGuide.ObjectModels.LoadProcedure.ILoadProcedure;
             Debug.Assert(_lp != null);
-            
+
             service.RegisterCustomNotifier(this);
 
             CollapsiblePanel tp = null;
@@ -110,7 +109,7 @@
             this.Controls.Add(input);
         }
 
-        void OnExecute(object sender, EventArgs e)
+        private void OnExecute(object sender, EventArgs e)
         {
             var pdlg = new ProgressDialog();
             pdlg.CancelAbortsThread = true;
@@ -134,7 +133,7 @@
             }
         }
 
-        object ExecuteLoadProcedure(BackgroundWorker worker, DoWorkEventArgs e, params object[] args)
+        private object ExecuteLoadProcedure(BackgroundWorker worker, DoWorkEventArgs e, params object[] args)
         {
             OSGeo.MapGuide.MaestroAPI.LengthyOperationProgressCallBack cb = (s, cbArgs) =>
             {
@@ -147,4 +146,4 @@
             return proc.CurrentConnection.ExecuteLoadProcedure(proc, cb, true);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/LoadTargetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/LoadTargetCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/LoadTargetCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using Maestro.Shared.UI;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.LoadProcedure;
+using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.LoadProcedure;
+using System;
+using System.ComponentModel;
 
 namespace Maestro.Editors.LoadProcedure
 {
@@ -71,7 +69,7 @@
             base.UnsubscribeEventHandlers();
         }
 
-        void OnLoadProcedurePropertyChanged(object sender, PropertyChangedEventArgs e)
+        private void OnLoadProcedurePropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             OnResourceChanged();
         }
@@ -97,4 +95,4 @@
             txtLayerRoot.Text = _service.SelectFolder();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace Maestro.Editors.LoadProcedure
@@ -29,7 +29,7 @@
     /// editing and executing Load Procedure resources
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/SdfTransformationCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/SdfTransformationCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/SdfTransformationCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.ObjectModels.LoadProcedure;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using Maestro.Shared.UI;
 using System.Diagnostics;
-using OSGeo.MapGuide.ObjectModels.LoadProcedure;
-using Maestro.Editors.Common;
 
 namespace Maestro.Editors.LoadProcedure
 {
@@ -67,4 +65,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/ShpTransformationCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/ShpTransformationCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/ShpTransformationCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.ObjectModels.LoadProcedure;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using Maestro.Shared.UI;
 using System.Diagnostics;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.LoadProcedure;
 
 namespace Maestro.Editors.LoadProcedure
 {
@@ -40,7 +38,7 @@
         }
 
         private IEditorService _service;
-        
+
         public override void Bind(IEditorService service)
         {
             _service = service;
@@ -66,4 +64,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/SqliteTransformationCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/SqliteTransformationCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/SqliteTransformationCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.LoadProcedure;
 using Maestro.Shared.UI;
+using OSGeo.MapGuide.ObjectModels.LoadProcedure;
+using System;
+using System.ComponentModel;
 
 namespace Maestro.Editors.LoadProcedure
 {
@@ -60,4 +58,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/CommonPropertyCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/CommonPropertyCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/CommonPropertyCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Windows.Forms;
 
 namespace Maestro.Editors.MapDefinition
@@ -38,8 +34,8 @@
         public object SelectedObject
         {
             get { return propGrid.SelectedObject; }
-            set 
-            { 
+            set
+            {
                 propGrid.SelectedObject = value;
                 SetCount(1);
             }
@@ -60,8 +56,8 @@
         public object[] SelectedObjects
         {
             get { return propGrid.SelectedObjects; }
-            set 
-            { 
+            set
+            {
                 propGrid.SelectedObjects = value;
                 SetCount(value.Length);
             }
@@ -75,4 +71,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ExtentCalculationDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ExtentCalculationDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ExtentCalculationDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.ObjectModels.Common;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Editors.MapDefinition
 {
@@ -78,13 +78,13 @@
             bgCalculation.RunWorkerAsync(_mdf);
         }
 
-        enum TransformStatus
+        private enum TransformStatus
         {
             Pass,
             Fail
         }
 
-        class CalculationResult
+        private class CalculationResult
         {
             public TransformStatus Status { get; set; }
 
@@ -184,7 +184,7 @@
                     if (!string.IsNullOrEmpty(wkt))
                     {
                         e1 = Utility.TransformEnvelope(e1, wkt, mdf.CoordinateSystem);
-                        res.TransformedResult = e1;       
+                        res.TransformedResult = e1;
                     }
                 }
                 else
@@ -254,4 +254,4 @@
             btnAccept.Enabled = btnClose.Enabled = true;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/FiniteScaleListCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/FiniteScaleListCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/FiniteScaleListCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
 
 namespace Maestro.Editors.MapDefinition
 {
@@ -68,7 +66,7 @@
             _scales.ListChanged += new ListChangedEventHandler(OnScaleListChanged);
         }
 
-        void OnScaleListChanged(object sender, ListChangedEventArgs e)
+        private void OnScaleListChanged(object sender, ListChangedEventArgs e)
         {
             switch (e.ListChangedType)
             {
@@ -77,6 +75,7 @@
                         AddScaleToMap(_scales[e.NewIndex]);
                     }
                     break;
+
                 case ListChangedType.Reset:
                     {
                         ClearScales();
@@ -173,7 +172,7 @@
             }
         }
 
-        static double[] CMS_SCALE_LIST = { 
+        private static double[] CMS_SCALE_LIST = {
             1128.49722,
             2256.9944399999999,
             4513.9888799999999,
@@ -209,4 +208,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/GroupPropertiesCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/GroupPropertiesCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/GroupPropertiesCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Editors.MapDefinition
 {
@@ -39,6 +38,7 @@
         }
 
         public event EventHandler GroupChanged;
+
         private IMapDefinition _mdf;
         private IMapLegendElementBase _el;
 
@@ -96,14 +96,14 @@
             }
         }
 
-        void OnGroupChanged(object sender, PropertyChangedEventArgs e)
+        private void OnGroupChanged(object sender, PropertyChangedEventArgs e)
         {
             var handler = this.GroupChanged;
             if (handler != null)
                 handler(this, EventArgs.Empty);
         }
 
-        static int GetGroupCount(IMapDefinition map, string name)
+        private static int GetGroupCount(IMapDefinition map, string name)
         {
             int count = 0;
             foreach (var grp in map.MapLayerGroup)
@@ -144,4 +144,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using Maestro.Shared.UI;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI.Services;
+using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
+using System;
+using System.ComponentModel;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.MapDefinition
 {
@@ -42,6 +40,7 @@
         }
 
         public event EventHandler LayerChanged;
+
         private IEditorService _edSvc;
 
         public LayerPropertiesCtrl(IMapLayer layer, IEditorService edSvc)
@@ -66,7 +65,7 @@
             TextBoxBinder.BindText(txtLegendLabel, layer, "LegendLabel");
         }
 
-        void OnLayerChanged(object sender, PropertyChangedEventArgs e)
+        private void OnLayerChanged(object sender, PropertyChangedEventArgs e)
         {
             var handler = this.LayerChanged;
             if (handler != null)
@@ -91,4 +90,4 @@
                 _edSvc.OpenResource(txtResourceId.Text);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/Live/DragMessages.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/Live/DragMessages.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/Live/DragMessages.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace Maestro.Editors.MapDefinition.Live
 {
     internal class ResourceDragMessage
     {
-        public ResourceDragMessage(string resId) { this.ResourceID = resId; }
+        public ResourceDragMessage(string resId)
+        {
+            this.ResourceID = resId;
+        }
 
         public string ResourceID { get; private set; }
     }
@@ -53,4 +54,4 @@
 
         public string GroupName { get; private set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/Live/NewGroupDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/Live/NewGroupDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/Live/NewGroupDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Mapping;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Mapping;
 
 namespace Maestro.Editors.MapDefinition.Live
 {
@@ -70,4 +67,4 @@
             btnOK.Enabled = !string.IsNullOrEmpty(name) && !string.IsNullOrEmpty(label);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,39 +1,37 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.MapDefinition.Live;
+using Maestro.MapViewer;
+using Maestro.MapViewer.Model;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Mapping;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using Maestro.MapViewer.Model;
-using Maestro.Editors.MapDefinition.Live;
-using Maestro.MapViewer;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
+using System;
+using System.ComponentModel;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.MapDefinition
 {
@@ -62,7 +60,7 @@
 
         /// <summary>
         /// Synchronizes the internal Map Definition with the state of the Runtime Map.
-        /// 
+        ///
         /// Call this before attempting access to the internal Map Definition to ensure a consistent state
         /// </summary>
         public void SyncMap()
@@ -229,4 +227,4 @@
             legendCtrl.HandleItemDrag(e);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorDrawOrder.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorDrawOrder.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorDrawOrder.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,36 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.ComponentModel;
-using System.Drawing;
-using System.Linq;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.MapDefinition.Live;
 using Maestro.MapViewer;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Mapping;
-using Maestro.Editors.MapDefinition.Live;
 using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using System;
+using System.Drawing;
+using System.Linq;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.MapDefinition
 {
@@ -46,19 +48,19 @@
             //HACK: http://social.msdn.microsoft.com/Forums/zh/winformsdatacontrols/thread/2db8e07a-6aa8-4865-9b59-c02025eaf317
             lstDrawOrder.CreateControl();
         }
-        
+
         private RuntimeMap _map;
         private IMapViewer _viewer;
-        
+
         /// <summary>
         /// Gets or sets the viewer instance
         /// </summary>
         public IMapViewer Viewer
         {
             get { return _viewer; }
-            set 
+            set
             {
-                if (_viewer != value) 
+                if (_viewer != value)
                 {
                     if (_viewer != null)
                         _viewer.MapLoaded -= OnMapLoaded;
@@ -74,25 +76,25 @@
             }
         }
 
-        void OnMapLoaded(object sender, EventArgs e)
+        private void OnMapLoaded(object sender, EventArgs e)
         {
             _map = _viewer.GetMap();
             BindMap();
         }
-        
+
         private void OnMapLayersChanged(object sender, EventArgs e)
         {
             RefreshLayerList();
         }
-        
-        private void UnbindMap() 
+
+        private void UnbindMap()
         {
             if (_map == null)
                 return;
 
             _map.Layers.CollectionChanged -= OnMapLayersChanged;
         }
-        
+
         private void BindMap()
         {
             if (_map == null)
@@ -221,7 +223,6 @@
 
         private void lstDrawOrder_DragEnter(object sender, DragEventArgs e)
         {
-
         }
 
         private void lstDrawOrder_DragDrop(object sender, DragEventArgs e)
@@ -270,4 +271,4 @@
     /// <param name="sender"></param>
     /// <param name="layer"></param>
     public delegate void LayerEventHandler(object sender, RuntimeMapLayer layer);
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorLegend.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorLegend.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorLegend.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,37 +1,38 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.ComponentModel;
-using System.Drawing;
-using System.Windows.Forms;
+//
 
+#endregion Disclaimer / License
+
+using Maestro.Editors.Generic;
+using Maestro.Editors.MapDefinition.Live;
 using Maestro.MapViewer;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using Maestro.Editors.Generic;
+using Maestro.MapViewer.Model;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Mapping;
 using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using Maestro.MapViewer.Model;
+using System;
 using System.Diagnostics;
-using Maestro.Editors.MapDefinition.Live;
+using System.Drawing;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.MapDefinition
 {
@@ -48,7 +49,7 @@
             InitializeComponent();
             legendCtrl.NodeSelected += new NodeEventHandler(OnInnerNodeSelected);
         }
-        
+
         private void OnInnerNodeSelected(object sender, TreeNode e)
         {
             var h = this.NodeSelected;
@@ -65,7 +66,7 @@
         /// Raised when a node in the legend is selected
         /// </summary>
         public event NodeEventHandler NodeSelected;
-        
+
         /// <summary>
         /// Gets or sets the associated map viewer
         /// </summary>
@@ -333,7 +334,6 @@
                     }
                     else if (res != null)
                     {
-
                         if (groupMeta != null)
                             e.Effect = DragDropEffects.Copy;
                         else
@@ -344,7 +344,7 @@
                         e.Effect = DragDropEffects.None;
                     }
                 }
-                else 
+                else
                 {
                     e.Effect = DragDropEffects.None;
                 }
@@ -381,4 +381,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorRepositoryView.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorRepositoryView.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorRepositoryView.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Services;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels.Common;
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.MapDefinition
 {
@@ -136,7 +134,7 @@
             {
                 repoView.RefreshModel(item.ResourceId);
             }
-            else 
+            else
             {
                 var parent = ResourceIdentifier.GetParentFolder(item.ResourceId);
                 repoView.RefreshModel(parent);
@@ -150,4 +148,4 @@
                 h(this, e);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ManualScaleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ManualScaleEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ManualScaleEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.MapDefinition
@@ -34,7 +33,7 @@
             InitializeComponent();
         }
 
-        public ManualScaleEditor(IEnumerable<double> scales) 
+        public ManualScaleEditor(IEnumerable<double> scales)
             : this()
         {
             List<string> values = new List<string>();
@@ -69,4 +68,4 @@
             this.DialogResult = DialogResult.OK;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapDefinitionEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapDefinitionEditorCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapDefinitionEditorCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.WatermarkDefinition;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.MapDefinition
 {
@@ -77,9 +74,9 @@
             mapLayersCtrl.RequestLayerOpen += new OpenLayerEventHandler(OnRequestLayerOpen);
         }
 
-        void OnRequestLayerOpen(object sender, string layerResourceId)
+        private void OnRequestLayerOpen(object sender, string layerResourceId)
         {
             _edSvc.OpenResource(layerResourceId);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,43 +1,43 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Aga.Controls.Tree;
+using Maestro.Editors.Common;
+using Maestro.Editors.Generic;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Tile;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Linq;
 using System.Windows.Forms;
-using Maestro.Shared.UI;
-using Aga.Controls.Tree;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using Maestro.Editors.Common;
-using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI.Tile;
 
 namespace Maestro.Editors.MapDefinition
 {
     /// <summary>
-    /// 
+    ///
     /// </summary>
     public delegate void OpenLayerEventHandler(object sender, string layerResourceId);
 
@@ -53,7 +53,7 @@
             trvLayersGroup.KeyUp += WeakEventHandler.Wrap<KeyEventHandler>(trvLayersGroup_KeyUp, (eh) => trvLayersGroup.KeyUp -= eh);
         }
 
-        void trvLayersGroup_KeyUp(object sender, KeyEventArgs e)
+        private void trvLayersGroup_KeyUp(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Delete || e.KeyCode == Keys.Up || e.KeyCode == Keys.Down)
             {
@@ -84,7 +84,7 @@
             }
         }
 
-        void trvLayerDrawingOrder_KeyUp(object sender, KeyEventArgs e)
+        private void trvLayerDrawingOrder_KeyUp(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Delete || e.KeyCode == Keys.Up || e.KeyCode == Keys.Down)
             {
@@ -103,7 +103,7 @@
             }
         }
 
-        void trvBaseLayers_KeyUp(object sender, KeyEventArgs e)
+        private void trvBaseLayers_KeyUp(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Delete || e.KeyCode == Keys.Up || e.KeyCode == Keys.Down)
             {
@@ -206,9 +206,10 @@
             propertiesPanel.Controls.Add(item);
         }
 
-        class LocalizedDisplayNameAttribute : DisplayNameAttribute
+        private class LocalizedDisplayNameAttribute : DisplayNameAttribute
         {
             private readonly string resourceName;
+
             public LocalizedDisplayNameAttribute(string resourceName)
                 : base()
             {
@@ -371,7 +372,7 @@
             }
         }
 
-        #endregion
+        #endregion Designer Attributes
 
         private Control CreateGroupControl(GroupItem group)
         {
@@ -389,7 +390,7 @@
 
             ctrl.Controls.Add(commCtrl);
             ctrl.Controls.Add(item);
-            
+
             ctrl.Dock = DockStyle.Fill;
 
             return ctrl;
@@ -403,7 +404,7 @@
             commCtrl.Dock = DockStyle.Fill;
 
             List<object> values = new List<object>();
-            for (int i = 0; i < nodes.Count; i++ )
+            for (int i = 0; i < nodes.Count; i++)
             {
                 var grp = nodes[i].Tag as GroupItem;
                 var lyr = nodes[i].Tag as LayerItem;
@@ -497,7 +498,7 @@
             return ctrl;
         }
 
-        #endregion
+        #endregion Control Factories
 
         private void OnDynamicLayerItemSelected(LayerItem layer)
         {
@@ -514,9 +515,9 @@
             propertiesPanel.Controls.Add(item);
         }
 
-        static bool AllLayers(System.Collections.ObjectModel.ReadOnlyCollection<TreeNodeAdv> nodes)
+        private static bool AllLayers(System.Collections.ObjectModel.ReadOnlyCollection<TreeNodeAdv> nodes)
         {
-            foreach(var node in nodes)
+            foreach (var node in nodes)
             {
                 var layer = node.Tag as LayerItem;
                 if (layer == null)
@@ -525,7 +526,7 @@
             return true;
         }
 
-        static bool AllBaseLayers(System.Collections.ObjectModel.ReadOnlyCollection<TreeNodeAdv> nodes)
+        private static bool AllBaseLayers(System.Collections.ObjectModel.ReadOnlyCollection<TreeNodeAdv> nodes)
         {
             foreach (var node in nodes)
             {
@@ -536,7 +537,7 @@
             return true;
         }
 
-        static bool AllGroups(System.Collections.ObjectModel.ReadOnlyCollection<TreeNodeAdv> nodes)
+        private static bool AllGroups(System.Collections.ObjectModel.ReadOnlyCollection<TreeNodeAdv> nodes)
         {
             foreach (var node in nodes)
             {
@@ -547,7 +548,7 @@
             return true;
         }
 
-        static bool AllBaseGroups(System.Collections.ObjectModel.ReadOnlyCollection<TreeNodeAdv> nodes)
+        private static bool AllBaseGroups(System.Collections.ObjectModel.ReadOnlyCollection<TreeNodeAdv> nodes)
         {
             foreach (var node in nodes)
             {
@@ -840,7 +841,6 @@
             }
         }
 
-       
         private void btnDLMoveLayerTop_Click(object sender, EventArgs e)
         {
             var layer = GetSelectedDrawOrderItem() as LayerItem;
@@ -874,7 +874,7 @@
             foreach (var node in tree.AllNodes)
             {
                 var tag = node.Tag as TaggedType;
-                
+
                 if (tag != null && predicate(tag))
                 {
                     selectedNode = node;
@@ -1280,7 +1280,7 @@
 
         private void btnMoveLayerOrGroupUp_Click(object sender, EventArgs e)
         {
-            object item = GetSelectedLayerGroupItem(); 
+            object item = GetSelectedLayerGroupItem();
             var group = item as GroupItem;
             var layer = item as LayerItem;
             if (group != null)
@@ -1585,7 +1585,7 @@
 
                         grp = parent;
                     }
-                }        
+                }
             }
             return false;
         }
@@ -1608,7 +1608,6 @@
                 }
                 else
                 {
-
                     e.Effect = DragDropEffects.Move;
                 }
             }
@@ -1923,9 +1922,11 @@
                     case 0: //Logical
                         RestoreLayerSelection(_activeLayer);
                         break;
+
                     case 1: //Draw Order
                         RestoreDrawOrderSelection(_activeLayer);
                         break;
+
                     default:
                         _activeLayer = null;
                         break;
@@ -2028,4 +2029,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapSettingsSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapSettingsSectionCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapSettingsSectionCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,38 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using Maestro.Shared.UI;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels.MapDefinition;
+using System;
+using System.ComponentModel;
 using System.Globalization;
-using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
-using OSGeo.MapGuide.ObjectModels;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.MapDefinition
 {
@@ -47,8 +42,8 @@
 
         private IMapDefinition _map;
 
-        const string META_START = "<MapDescription>";
-        const string META_END = "</MapDescription>";
+        private const string META_START = "<MapDescription>";
+        private const string META_END = "</MapDescription>";
 
         private IEditorService _service;
         private bool _updatingExtents = false;
@@ -156,10 +151,10 @@
                     _map.Extents.MaxY = d;
             };
 
-            PropertyChangedEventHandler extChange = (sender, e) => 
+            PropertyChangedEventHandler extChange = (sender, e) =>
             {
                 UpdateExtentsFromMap();
-                OnResourceChanged(); 
+                OnResourceChanged();
             };
             var ext = _map.Extents;
             ext.PropertyChanged += WeakEventHandler.Wrap<PropertyChangedEventHandler>(extChange, (eh) => ext.PropertyChanged -= eh);
@@ -235,4 +230,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapTreeModels.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapTreeModels.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapTreeModels.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Aga.Controls.Tree;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using Aga.Controls.Tree;
+using System.ComponentModel;
 using System.Drawing;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using System.ComponentModel;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Editors.MapDefinition
 {
@@ -60,7 +62,7 @@
             layer.PropertyChanged += WeakEventHandler.Wrap<PropertyChangedEventHandler>(OnPropertyChanged, (eh) => layer.PropertyChanged -= eh);
         }
 
-        void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
+        private void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             if (e.PropertyName == "Name")
             {
@@ -77,7 +79,7 @@
             grp.PropertyChanged += WeakEventHandler.Wrap<PropertyChangedEventHandler>(OnPropertyChanged, (eh) => grp.PropertyChanged -= eh);
         }
 
-        void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
+        private void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             if (e.PropertyName == "Name")
             {
@@ -101,7 +103,7 @@
             set;
         }
 
-        void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
+        private void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             if (e.PropertyName == "Name")
             {
@@ -118,7 +120,7 @@
             group.PropertyChanged += WeakEventHandler.Wrap<PropertyChangedEventHandler>(OnPropertyChanged, (eh) => group.PropertyChanged -= eh); ;
         }
 
-        void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
+        private void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             if (e.PropertyName == "Name")
             {
@@ -152,7 +154,7 @@
         }
 
         public event EventHandler<TreeModelEventArgs> NodesRemoved;
-        
+
         protected void OnStructureChanged(TreePathEventArgs e)
         {
             var handler = this.StructureChanged;
@@ -311,4 +313,4 @@
             return grp == null;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace Maestro.Editors.MapDefinition
@@ -29,7 +29,7 @@
     /// editing Map Definition documents
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ScaleListGenerator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ScaleListGenerator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ScaleListGenerator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Editors.MapDefinition
 {
@@ -111,4 +113,4 @@
             return new List<double>(sorted.Keys).ToArray();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/SelectedItemsDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/SelectedItemsDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/SelectedItemsDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.MapDefinition
@@ -73,4 +70,4 @@
             this.Close();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Migration/CopyMoveToServerDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Migration/CopyMoveToServerDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Migration/CopyMoveToServerDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Generic;
+using OSGeo.MapGuide.MaestroAPI;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Generic;
 
 namespace Maestro.Editors.Migration
 {
@@ -64,11 +63,12 @@
         }
 
         //Used to persist state between dialog invocations
-        static string _lastSourceFolder;
-        static string _lastTargetFolder;
-        static MigrationAction _lastAction;
-        static bool _overwrite = false;
+        private static string _lastSourceFolder;
 
+        private static string _lastTargetFolder;
+        private static MigrationAction _lastAction;
+        private static bool _overwrite = false;
+
         private void btnAddResource_Click(object sender, EventArgs e)
         {
             using (var picker = new ResourcePicker(_source, ResourcePickerMode.OpenResource))
@@ -179,7 +179,7 @@
         public MigrationAction SelectedAction
         {
             get { return (MigrationAction)cmbAction.SelectedItem; }
-            set { cmbAction.SelectedItem = value ; }
+            set { cmbAction.SelectedItem = value; }
         }
 
         /// <summary>
@@ -231,12 +231,13 @@
     public enum MigrationAction
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Copy,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Move
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Migration/MigrateDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Migration/MigrateDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Migration/MigrateDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Generic;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Generic;
-using Maestro.Shared.UI;
 
 namespace Maestro.Editors.Migration
 {
@@ -222,4 +221,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Migration/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Migration/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Migration/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace Maestro.Editors.Migration
@@ -29,7 +29,7 @@
     /// performing cross-connection migration tasks.
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,37 +1,37 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace Maestro.Editors
 {
     /// <summary>
     /// The <c>Maestro.Editors</c> namespace is the root namespace of the Maestro.Editors assembly.
-    /// 
+    ///
     /// This assembly provides reusable UI components for interacting with MapGuide Service APIs and for
     /// editing MapGuide resource classes
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/OdbcDriverMap.xml
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/OdbcDriverMap.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/OdbcDriverMap.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<!-- 
+<!--
 This file allows the ODBC Known Driver connection builder to load builders of known
-ODBC drivers. Connection builders specified in this file must inherit from the 
+ODBC drivers. Connection builders specified in this file must inherit from the
 Maestro.Editors.FeatureSource.Providers.Odbc.OdbcDriverInfo class
 
 To create your own ODBC driver connection builder, extend the OdbcDriverInfo class. Define the

Modified: trunk/Tools/Maestro/Maestro.Editors/Packaging/AddResourceEntryDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Packaging/AddResourceEntryDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Packaging/AddResourceEntryDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
 
 namespace Maestro.Editors.Packaging
 {
@@ -100,10 +98,12 @@
         /// Gets the content filepath.
         /// </summary>
         public string ContentFilepath { get { return ContentPath.Text; } }
+
         /// <summary>
         /// Gets the header filepath.
         /// </summary>
         public string HeaderFilepath { get { return UseHeader.Checked ? HeaderPath.Text : null; } }
+
         /// <summary>
         /// Gets the name of the resource.
         /// </summary>

Modified: trunk/Tools/Maestro/Maestro.Editors/Packaging/EditResourceDataEntryDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Packaging/EditResourceDataEntryDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Packaging/EditResourceDataEntryDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.Packaging
@@ -99,7 +97,6 @@
             ContentTypeBox.Text = m_contentType;
             DataTypeBox.SelectedIndex = DataTypeBox.FindString(m_datatype);
             FilenameBox.Text = m_filename;
-
         }
 
         private void ValidateForm(object sender, EventArgs e)

Modified: trunk/Tools/Maestro/Maestro.Editors/Packaging/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Packaging/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Packaging/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace Maestro.Editors.Packaging
@@ -29,7 +29,7 @@
     /// editing MapGuide Package files
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Packaging/PackageEditorDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Packaging/PackageEditorDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Packaging/PackageEditorDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Packaging;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Exceptions;
 using OSGeo.MapGuide.MaestroAPI.Resource;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
 using System.IO;
-using Maestro.Packaging;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.Packaging
 {
@@ -140,7 +140,6 @@
 
         private void MainGroup_Panel2_Paint(object sender, PaintEventArgs e)
         {
-
         }
 
         private void ResourcDataFileList_SelectedIndexChanged(object sender, EventArgs e)
@@ -215,7 +214,7 @@
 
                 if ((ResourceDataFileList.SelectedItems[0].Tag as ResourceDataItem).EntryType == EntryTypeEnum.Regular)
                 {
-                    using(ICSharpCode.SharpZipLib.Zip.ZipFile zipfile = new ICSharpCode.SharpZipLib.Zip.ZipFile(m_filename))
+                    using (ICSharpCode.SharpZipLib.Zip.ZipFile zipfile = new ICSharpCode.SharpZipLib.Zip.ZipFile(m_filename))
                     {
                         int index = FindZipEntry(zipfile, (ResourceDataFileList.SelectedItems[0].Tag as ResourceDataItem).Filename);
                         if (index >= 0)
@@ -233,7 +232,6 @@
                 string msg = NestedExceptionMessageProcessor.GetFullMessage(ex);
                 MessageBox.Show(this, string.Format(Strings.FileCopyError, ex.Message), Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
-
         }
 
         private void EditResourceData_Click(object sender, EventArgs e)
@@ -402,7 +400,7 @@
                     else
                         ResourceTree.SelectedNode.Parent.Nodes.Add(n);
                 }
-                
+
                 n.EnsureVisible();
                 ResourceTree.SelectedNode = n;
                 ResourceTree.Focus();

Modified: trunk/Tools/Maestro/Maestro.Editors/Preview/DefaultResourcePreviewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Preview/DefaultResourcePreviewer.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Preview/DefaultResourcePreviewer.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,22 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.SymbolDefinition;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
@@ -27,8 +30,6 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
-using System.Text;
 
 namespace Maestro.Editors.Preview
 {
@@ -50,7 +51,6 @@
 
         internal abstract class PreviewResult
         {
-
         }
 
         internal class UrlPreviewResult : PreviewResult
@@ -96,7 +96,7 @@
                 var previewCopy = resSvc.GetResource(resId);
 
                 if (previewCopy.ResourceType == ResourceTypes.SymbolDefinition.ToString() && conn.SiteVersion >= new Version(2, 0))
-                {   
+                {
                     return GenerateSymbolDefinitionPreview(conn, previewCopy, 100, 100);
                 }
                 else
@@ -132,12 +132,12 @@
 
         internal static ImagePreviewResult GenerateSymbolDefinitionPreview(IServerConnection conn, IResource previewCopy, int width, int height)
         {
-            //For Symbol Definition previews, we make a placeholder Layer Definition with the 
+            //For Symbol Definition previews, we make a placeholder Layer Definition with the
             ILayerDefinition layerDef = ObjectFactory.CreateDefaultLayer(conn, LayerType.Vector);
             IVectorLayerDefinition2 vl = layerDef.SubLayer as IVectorLayerDefinition2;
             if (vl != null)
             {
-                //HACK-ish: We are flubbing a completely invalid Layer Definition under normal circumstances, 
+                //HACK-ish: We are flubbing a completely invalid Layer Definition under normal circumstances,
                 //but one that has the minimum required content model to generate an appropriate GETLEGENDIMAGE preview for
                 vl.FeatureName = string.Empty;
                 vl.ResourceId = string.Empty;
@@ -203,4 +203,4 @@
             return false;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Preview/IResourcePreviewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Preview/IResourcePreviewer.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Preview/IResourcePreviewer.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Resource;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Maestro.Editors.Preview
 {
@@ -56,4 +55,4 @@
         /// </remarks>
         void Preview(IResource res, IEditorService edSvc, string locale);
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Preview/IUrlLauncherService.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Preview/IUrlLauncherService.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Preview/IUrlLauncherService.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace Maestro.Editors.Preview
 {
     /// <summary>
@@ -35,4 +33,4 @@
         /// <param name="url"></param>
         void OpenUrl(string url);
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Preview/LocalMapPreviewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Preview/LocalMapPreviewer.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Preview/LocalMapPreviewer.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,22 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Mapping;
@@ -26,9 +29,6 @@
 using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Maestro.Editors.Preview
 {
@@ -39,7 +39,7 @@
     {
         private IResourcePreviewer _inner;
         private IUrlLauncherService _launcher;
-        
+
         /// <summary>
         /// Initializes a new instance of the LocalMapPreviewer class
         /// </summary>
@@ -94,7 +94,7 @@
             Preview(res, edSvc, null);
         }
 
-        static bool SupportsMappingService(IServerConnection conn)
+        private static bool SupportsMappingService(IServerConnection conn)
         {
             return Array.IndexOf(conn.Capabilities.SupportedServices, (int)ServiceType.Mapping) >= 0;
         }
@@ -127,11 +127,13 @@
                                 previewMdf = ResourcePreviewEngine.CreateLayerPreviewMapDefinition(ldf, edSvc.SessionID, layerName, conn);
                             }
                             break;
+
                         case "WatermarkDefinition":
                             {
                                 previewMdf = Utility.CreateWatermarkPreviewMapDefinition((IWatermarkDefinition)res);
                             }
                             break;
+
                         case "MapDefinition":
                             {
                                 previewMdf = (IMapDefinition)res;
@@ -177,4 +179,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Preview/MapPreviewDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Preview/MapPreviewDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Preview/MapPreviewDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Mapping;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.Globalization;
 using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.Preview
@@ -108,4 +107,4 @@
             _launcher.OpenUrl(mapagent);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Preview/PreviewSettings.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Preview/PreviewSettings.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Preview/PreviewSettings.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace Maestro.Editors.Preview
 {
     /// <summary>
@@ -52,4 +50,4 @@
         /// </summary>
         public static bool UseAjaxViewer { get; set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Preview/ResourcePreviewEngine.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Preview/ResourcePreviewEngine.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Preview/ResourcePreviewEngine.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,36 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI.Resource.Preview;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
-using OSGeo.MapGuide.ObjectModels.WebLayout;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 
 namespace Maestro.Editors.Preview
@@ -68,7 +65,7 @@
 
         #region Preview helper code
 
-        static string CreateDebugWatermark(IMapDefinition2 mdf, IServerConnection conn, string layerSc)
+        private static string CreateDebugWatermark(IMapDefinition2 mdf, IServerConnection conn, string layerSc)
         {
             //Tidy up the CS WKT so that it can display nicely in a watermark
             StringBuilder cleanCs = new StringBuilder(mdf.CoordinateSystem);
@@ -133,6 +130,6 @@
             return mdf;
         }
 
-        #endregion
+        #endregion Preview helper code
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Preview/ResourcePreviewFactory.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Preview/ResourcePreviewFactory.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Preview/ResourcePreviewFactory.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Resource;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Maestro.Editors.Preview
 {
@@ -30,7 +30,7 @@
     /// </summary>
     public static class ResourcePreviewerFactory
     {
-        static Dictionary<string, IResourcePreviewer> _previewers = new Dictionary<string, IResourcePreviewer>();
+        private static Dictionary<string, IResourcePreviewer> _previewers = new Dictionary<string, IResourcePreviewer>();
 
         /// <summary>
         /// Registers the given <see cref="T:Maestro.Editors.Preview.IResourcePreviewer"/> for a given connection provider
@@ -80,4 +80,4 @@
             return null;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Preview/StubPreviewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Preview/StubPreviewer.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Preview/StubPreviewer.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Resource;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Maestro.Editors.Preview
 {
@@ -48,7 +47,6 @@
         /// <param name="edSvc">The editor service</param>
         public void Preview(IResource res, IEditorService edSvc)
         {
-
         }
 
         /// <summary>
@@ -63,7 +61,6 @@
         /// </remarks>
         public void Preview(IResource res, IEditorService edSvc, string locale)
         {
-
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/PrintLayout/LogoDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/PrintLayout/LogoDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/PrintLayout/LogoDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
 using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Common;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using System;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.PrintLayout
 {
@@ -145,4 +143,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/PrintLayout/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/PrintLayout/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/PrintLayout/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace Maestro.Editors.PrintLayout
@@ -29,7 +29,7 @@
     /// editing Print Layout documents
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintCustomLogosSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintCustomLogosSectionCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintCustomLogosSectionCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.PrintLayout;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using Maestro.Shared.UI;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.PrintLayout;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Editors.PrintLayout
 {
@@ -60,7 +58,7 @@
             _logos.ListChanged += new ListChangedEventHandler(OnLogoListChanged);
         }
 
-        void OnLogoListChanged(object sender, ListChangedEventArgs e)
+        private void OnLogoListChanged(object sender, ListChangedEventArgs e)
         {
             switch (e.ListChangedType)
             {
@@ -177,4 +175,4 @@
             btnEdit.Enabled = btnDelete.Enabled = (lstCustomLogos.SelectedItems.Count > 0);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintCustomTextSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintCustomTextSectionCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintCustomTextSectionCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using OSGeo.MapGuide.ObjectModels.PrintLayout;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using Maestro.Shared.UI;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.PrintLayout;
 
 namespace Maestro.Editors.PrintLayout
 {
@@ -62,7 +60,7 @@
             _texts.ListChanged += new ListChangedEventHandler(OnTextListChanged);
         }
 
-        void OnTextListChanged(object sender, ListChangedEventArgs e)
+        private void OnTextListChanged(object sender, ListChangedEventArgs e)
         {
             switch (e.ListChangedType)
             {
@@ -135,4 +133,4 @@
             btnEdit.Enabled = btnDelete.Enabled = (lstCustomText.SelectedItem != null);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintLayoutEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintLayoutEditorCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintLayoutEditorCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
 
+#endregion Disclaimer / License
+
 namespace Maestro.Editors.PrintLayout
 {
     /// <summary>
@@ -51,4 +46,4 @@
             printTextCtrl.Bind(service);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintPagePropertiesSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintPagePropertiesSectionCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintPagePropertiesSectionCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using Maestro.Shared.UI;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
+using Maestro.Shared.UI;
 using OSGeo.MapGuide.ObjectModels.PrintLayout;
+using System.ComponentModel;
 
 namespace Maestro.Editors.PrintLayout
 {
@@ -66,7 +63,6 @@
             CheckBoxBinder.BindChecked(chkScaleBar, _layout.LayoutProperties, "ShowScaleBar");
             CheckBoxBinder.BindChecked(chkTitle, _layout.LayoutProperties, "ShowTitle");
             CheckBoxBinder.BindChecked(chkURL, _layout.LayoutProperties, "ShowURL");
-
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/PrintLayout/TextDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/PrintLayout/TextDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/PrintLayout/TextDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.PrintLayout
@@ -99,4 +97,4 @@
             this.DialogResult = DialogResult.OK;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Maestro.Editors")]
@@ -11,8 +10,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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)]
 

Modified: trunk/Tools/Maestro/Maestro.Editors/RepositoryHandle.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/RepositoryHandle.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/RepositoryHandle.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Editors
 {
@@ -51,4 +51,4 @@
             this.Connection = conn;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/RepositoryIcons.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/RepositoryIcons.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/RepositoryIcons.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI;
 using System.Windows.Forms;
 
 namespace Maestro.Editors
@@ -34,46 +34,57 @@
         /// Icon for resource types
         /// </summary>
         public const int RES_UNKNOWN = 0;
+
         /// <summary>
         /// Icon for feature sources
         /// </summary>
         public const int RES_FEATURESOURCE = 1;
+
         /// <summary>
         /// Icon for layer definitions
         /// </summary>
         public const int RES_LAYERDEFINITION = 2;
+
         /// <summary>
         /// Icon for map definitions
         /// </summary>
         public const int RES_MAPDEFINITION = 3;
+
         /// <summary>
         /// Icon for web layouts
         /// </summary>
         public const int RES_WEBLAYOUT = 4;
+
         /// <summary>
         /// Icon for symbol libraries
         /// </summary>
         public const int RES_SYMBOLLIBRARY = 5;
+
         /// <summary>
         /// Icon for print layouts
         /// </summary>
         public const int RES_PRINTLAYOUT = 6;
+
         /// <summary>
         /// Icon for drawing sources
         /// </summary>
         public const int RES_DRAWINGSOURCE = 7;
+
         /// <summary>
         /// Icon for application definitions
         /// </summary>
         public const int RES_APPLICATIONDEFINITION = 8;
+
         /// <summary>
         /// Icon for symbol definitions
         /// </summary>
         public const int RES_SYMBOLDEFINITION = 9;
+
         /// <summary>
         /// Icon for watermark definitions
         /// </summary>
         public const int RES_WATERMARK = 10;
+
         /// <summary>
         /// Icon for load procedures
         /// </summary>
@@ -83,6 +94,7 @@
         /// Icon for the root of the repository
         /// </summary>
         public const int RES_ROOT = 12;
+
         /// <summary>
         /// Icon for folders
         /// </summary>
@@ -99,28 +111,40 @@
             {
                 case "ApplicationDefinition":
                     return RES_APPLICATIONDEFINITION;
+
                 case "DrawingSource":
                     return RES_DRAWINGSOURCE;
+
                 case "FeatureSource":
                     return RES_FEATURESOURCE;
+
                 case "Folder":
                     return RES_FOLDER;
+
                 case "LayerDefinition":
                     return RES_LAYERDEFINITION;
+
                 case "LoadProcedure":
                     return RES_LOADPROCEDURE;
+
                 case "MapDefinition":
                     return RES_MAPDEFINITION;
+
                 case "PrintLayout":
                     return RES_PRINTLAYOUT;
+
                 case "SymbolDefinition":
                     return RES_SYMBOLDEFINITION;
+
                 case "SymbolLibrary":
                     return RES_SYMBOLLIBRARY;
+
                 case "WatermarkDefinition":
                     return RES_WATERMARK;
+
                 case "WebLayout":
                     return RES_WEBLAYOUT;
+
                 default:
                     throw new ArgumentException();
             }
@@ -161,4 +185,4 @@
             imgList.Images.Add(Properties.Resources.folder_horizontal);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/ResourceEditorServiceBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/ResourceEditorServiceBase.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/ResourceEditorServiceBase.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,35 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Services;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
-using System.ComponentModel;
-using System.IO;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using System;
+using System.ComponentModel;
+using System.IO;
+using System.Text;
 
 namespace Maestro.Editors
 {
@@ -40,6 +42,7 @@
         /// The server connection
         /// </summary>
         protected IServerConnection _conn;
+
         /// <summary>
         /// The resource being edited
         /// </summary>
@@ -52,12 +55,12 @@
         /// <param name="conn">The conn.</param>
         /// <remarks>
         /// The editor service does not do live edits of the resource you pass in to this constructor
-        /// 
+        ///
         /// When an editor is modifying a resource, it is not modifying the resource you specify here. It is instead modifying a
-        /// session-based copy of the resource that is created internally by the editor service. On a save action (a call to 
-        /// <see cref="M:Maestro.Editors.ResourceEditorServiceBase.Save"/>), the session-based copy is copied back into the resource 
+        /// session-based copy of the resource that is created internally by the editor service. On a save action (a call to
+        /// <see cref="M:Maestro.Editors.ResourceEditorServiceBase.Save"/>), the session-based copy is copied back into the resource
         /// id you specified, overwriting its contents and data files.
-        /// 
+        ///
         /// This provides an extra level of safety against unintentional edits, as such edits will only apply to the session-copy, only
         /// being committed back to the resource id you specified on an explicit save action.
         /// </remarks>
@@ -284,7 +287,7 @@
         /// </summary>
         public bool IsUpgradeAvailable
         {
-            get 
+            get
             {
                 if (_editCopy == null)
                     return false;
@@ -504,4 +507,4 @@
         /// </summary>
         public event EventHandler BeforePreview;
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Resources/CommandTypesDataset.xml
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Resources/CommandTypesDataset.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Resources/CommandTypesDataset.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 
-<!-- 
+<!--
   Note to translators:
     You can only translate <Label>, <ToolTip> and <Description>
     If you translate any of the others, the editor won't work!
@@ -15,7 +15,7 @@
 		<Description>Display information about this application</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon></EnabledIcon>		
+		<EnabledIcon></EnabledIcon>
 		<DisabledIcon></DisabledIcon>
 	</Command>
 
@@ -27,7 +27,7 @@
 		<Description>Create buffers around the selected features</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_buffer.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_buffer.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_buffer_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -39,7 +39,7 @@
 		<Description>Clear the current selections</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_clearselect.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_clearselect.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_clearselect_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -51,7 +51,7 @@
 		<Description>Copy current view of map to clipboard</Description>
 		<Viewers>DWF</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_copy.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_copy.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_copy_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -63,7 +63,7 @@
 		<Description>Launch help for this application</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_help.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_help.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_help_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -75,7 +75,7 @@
 		<Description>Zoom to the initial center and scale of the map</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_restorecenter.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_restorecenter.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_restorecenter_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -87,7 +87,7 @@
 		<Description>Fit the initial view of the map to the window</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_fitwindow.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_fitwindow.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_fitwindow_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -99,7 +99,7 @@
 		<Description>Invoke a script command</Description>
 		<Viewers>All</Viewers>
 		<Type>Custom</Type>
-		<EnabledIcon>../stdicons/icon_invokescript.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_invokescript.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_invokescript_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -111,7 +111,7 @@
 		<Description>Invoke a URL command</Description>
 		<Viewers>All</Viewers>
 		<Type>Custom</Type>
-		<EnabledIcon>../stdicons/icon_invokeurl.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_invokeurl.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_invokeurl_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -123,7 +123,7 @@
 		<Description>Measure distances on the map</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_measure.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_measure.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_measure_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -135,7 +135,7 @@
 		<Description>Buffer</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_zoomnext.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_zoomnext.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_zoomnext_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -147,7 +147,7 @@
 		<Description>Drag the map to view areas out of range</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_pan.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_pan.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_pan_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -159,7 +159,7 @@
 		<Description>Pan down by a preset increment</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_pandown.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_pandown.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_pandown_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -171,7 +171,7 @@
 		<Description>Pan left by a preset increment</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_panleft.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_panleft.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_panleft_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -183,7 +183,7 @@
 		<Description>Pan right by a preset increment</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_panright.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_panright.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_panright_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -195,7 +195,7 @@
 		<Description>Pan up by a preset increment</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_panup.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_panup.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_panup_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -207,7 +207,7 @@
 		<Description>Go to previous view</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_zoomprev.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_zoomprev.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_zoomprev_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -219,7 +219,7 @@
 		<Description>Print with optional layout</Description>
 		<Viewers>DWF</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_print.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_print.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_print_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -231,7 +231,7 @@
 		<Description>Refresh map and reload all layers keeping current center and scale</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_refreshmap.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_refreshmap.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_refreshmap_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -243,7 +243,7 @@
 		<Description>Perform a search</Description>
 		<Viewers>All</Viewers>
 		<Type>Custom</Type>
-		<EnabledIcon>../stdicons/icon_search.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_search.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_search_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -255,7 +255,7 @@
 		<Description>Select features by clicking and dragging</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_select.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_select.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_select_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -267,7 +267,7 @@
 		<Description>Create a polygon to select all features that fall within</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_selectpolygon.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_selectpolygon.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_selectpolygon_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -279,7 +279,7 @@
 		<Description>Click and drag to select all features inside the circle</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_selectradius.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_selectradius.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_selectradius_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -291,7 +291,7 @@
 		<Description>Select features that fall within currently selected areas</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_selectwithin.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_selectwithin.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_selectwithin_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -303,7 +303,7 @@
 		<Description>View Options</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_viewoptions.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_viewoptions.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_viewoptions_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -315,7 +315,7 @@
 		<Description>Zoom dynamically by clicking and dragging</Description>
 		<Viewers>DWF</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_zoom.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_zoom.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_zoom_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -327,7 +327,7 @@
 		<Description>Zoom in by a preset increment</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_zoomin.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_zoomin.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_zoomin_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -339,7 +339,7 @@
 		<Description>Zoom out by a preset increment</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_zoomout.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_zoomout.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_zoomout_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -351,7 +351,7 @@
 		<Description>Zoom in on an area</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_zoomrect.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_zoomrect.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_zoomrect_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -363,7 +363,7 @@
 		<Description>Zoom to extents of selected features</Description>
 		<Viewers>All</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_zoomselect.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_zoomselect.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_zoomselect_disabled.gif</DisabledIcon>
 	</Command>
 
@@ -375,8 +375,7 @@
 		<Description>Get printer-friendly page</Description>
 		<Viewers>AJAX</Viewers>
 		<Type>Built-In</Type>
-		<EnabledIcon>../stdicons/icon_printablepage.gif</EnabledIcon>		
+		<EnabledIcon>../stdicons/icon_printablepage.gif</EnabledIcon>
 		<DisabledIcon>../stdicons/icon_printablepage_disabled.gif</DisabledIcon>
 	</Command>
-
-</CommandTypesDataset>
+</CommandTypesDataset>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Resources/GeometryStyleComboDataset.xml
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Resources/GeometryStyleComboDataset.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/Resources/GeometryStyleComboDataset.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -32,7 +32,7 @@
 		<Display>Symbol...</Display>
 		<Value></Value>
 	</SymbolMark>
-	
+
 	<SizeContext>
 		<Display>Device space</Display>
 		<Value>DeviceUnits</Value>
@@ -41,7 +41,7 @@
 		<Display>Map space</Display>
 		<Value>MappingUnits</Value>
 	</SizeContext>
-	
+
 	<Units>
 		<Display>Points</Display>
 		<Value>Points</Value>
@@ -142,5 +142,4 @@
     <Display>Expression...</Display>
     <Value>Expression...</Value>
   </Horizontal>
-
 </ComboBoxDataSet>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/AdvancedSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/AdvancedSettingsCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/AdvancedSettingsCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
+using System;
+using System.ComponentModel;
 
 namespace Maestro.Editors.SymbolDefinition
 {
@@ -95,4 +93,4 @@
             ParameterSelector.ShowParameterSelector(_sym.ParameterDefinition.Parameter, sender);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/CompoundSymbolDefinitionEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/CompoundSymbolDefinitionEditorCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/CompoundSymbolDefinitionEditorCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Generic;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-using OSGeo.MapGuide.ObjectModels;
-using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Shared.UI;
 
 namespace Maestro.Editors.SymbolDefinition
 {
@@ -38,8 +37,8 @@
     [ToolboxItem(true)]
     public partial class CompoundSymbolDefinitionEditorCtrl : EditorBase
     {
-        const int IDX_SYMBOL = 0;
-        const int IDX_REFERENCE = 1;
+        private const int IDX_SYMBOL = 0;
+        private const int IDX_REFERENCE = 1;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="CompoundSymbolDefinitionEditorCtrl"/> class.
@@ -119,7 +118,7 @@
                 li.Tag = symRef;
                 lstSymbols.Items.Add(li);
             }
-            else 
+            else
             {
                 throw new ArgumentException("Unknown symbol reference type");
             }
@@ -185,4 +184,4 @@
             splitContainer1.Panel2.Controls.Clear();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ExtractSymbolLibraryDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ExtractSymbolLibraryDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ExtractSymbolLibraryDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,32 @@
 #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
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource.Conversion;
 using OSGeo.MapGuide.MaestroAPI.Services;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.SymbolDefinition
@@ -187,4 +186,4 @@
             EvaluateCommands();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GeneralSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GeneralSettingsCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GeneralSettingsCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using Maestro.Shared.UI;
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
+using System.ComponentModel;
 
 namespace Maestro.Editors.SymbolDefinition
 {
@@ -48,4 +45,4 @@
             TextBoxBinder.BindText(txtDescription, sym, "Description");
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,37 +1,35 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using Maestro.Editors.Generic;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
-using Maestro.Shared.UI;
 using System.IO;
-using Maestro.Editors.Common;
-using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.SymbolDefinition.GraphicsEditors
 {
@@ -177,7 +175,7 @@
             }
         }
 
-        static double PxToMM(int px, int dpi)
+        private static double PxToMM(int px, int dpi)
         {
             return (px * 25.4) / dpi;
         }
@@ -240,4 +238,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-using Maestro.Shared.UI;
-using Maestro.Editors.Common;
 
 namespace Maestro.Editors.SymbolDefinition.GraphicsEditors
 {
@@ -98,4 +96,4 @@
             _ed.RaiseResourceChanged();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-using Maestro.Shared.UI;
-using Maestro.Editors.Common;
 
 namespace Maestro.Editors.SymbolDefinition.GraphicsEditors
 {
@@ -54,14 +52,14 @@
                 _init = true;
 
                 _frame = _text.Frame;
-                
+
                 chkTextFrame.Checked = (_frame != null);
                 grpTextFrame.Enabled = chkTextFrame.Checked;
 
                 if (_frame == null)
                     _frame = _sym.CreateFrame();
 
-                TextBoxBinder.BindText(txtContent, _text, "Content"); 
+                TextBoxBinder.BindText(txtContent, _text, "Content");
 
                 symAlignmentHorizontal.Bind(_text, "HorizontalAlignment");
                 symAlignmentJustification.Bind(_text, "Justification");
@@ -107,7 +105,7 @@
         {
             if (_init)
                 return;
-            _ed.RaiseResourceChanged();   
+            _ed.RaiseResourceChanged();
         }
 
         private void OnRequestBrowse(SymbolField sender)
@@ -157,4 +155,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace Maestro.Editors.SymbolDefinition
@@ -29,7 +29,7 @@
     /// editing Symbol Definitions
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParameterSelector.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParameterSelector.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParameterSelector.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 
 namespace Maestro.Editors.SymbolDefinition
 {
@@ -59,7 +58,7 @@
 
         public IParameter SelectedParameter
         {
-            get 
+            get
             {
                 if (grdParameters.SelectedRows.Count == 1)
                     return grdParameters.SelectedRows[0].DataBoundItem as IParameter;
@@ -82,8 +81,8 @@
         internal bool IsFiltered
         {
             get { return _isFiltered; }
-            set 
-            { 
+            set
+            {
                 _isFiltered = value;
                 if (value)
                     grdParameters.DataSource = _filtered;
@@ -144,4 +143,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParametersCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParametersCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParametersCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 
 namespace Maestro.Editors.SymbolDefinition
 {
@@ -96,4 +95,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.SymbolDefinition
 {
@@ -46,4 +43,4 @@
             _edSvc = new SymbolEditorService(edSvc, symDef);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionEditorCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionEditorCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
+//
+
+#endregion Disclaimer / License
+
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
 
 namespace Maestro.Editors.SymbolDefinition
 {
@@ -57,4 +54,4 @@
             advancedSettingsCtrl.Bind(service);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels.Common;
+using System;
+using System.ComponentModel;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.SymbolDefinition
 {
@@ -79,4 +76,4 @@
             _symRef.ResourceId = txtResourceId.Text;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolEditorService.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolEditorService.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolEditorService.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI.Commands;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
+using System;
 
 namespace Maestro.Editors.SymbolDefinition
 {
@@ -222,4 +222,4 @@
             set;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolField.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolField.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolField.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,36 +1,35 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
-using System.Collections.Generic;
+using System.Collections;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using System.Windows.Forms.Design.Behavior;
-using System.Windows.Forms.Design;
 using System.ComponentModel.Design;
-using System.Collections;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-using OSGeo.MapGuide.MaestroAPI;
 using System.Reflection;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Windows.Forms.Design.Behavior;
 
 namespace Maestro.Editors.SymbolDefinition
 {
@@ -86,7 +85,6 @@
 
                     return snapLines;
                 }
-
             }
         }
 
@@ -110,7 +108,7 @@
             combo.TextChanged += new EventHandler(combo_TextChanged);
         }
 
-        void combo_TextChanged(object sender, EventArgs e)
+        private void combo_TextChanged(object sender, EventArgs e)
         {
             OnContentChanged();
         }
@@ -131,7 +129,7 @@
         public string Content
         {
             get { return combo.Text; }
-            set 
+            set
             {
                 if (combo.Text != value)
                 {
@@ -304,6 +302,7 @@
 
         //This code below attempts to approximate data binding
         private bool _suppressUI = false;           //Used to prevent a stack overflow due to a continuous UI -> Property -> UI -> ... chain
+
         private bool _suppressProperty = false;     //Used to prevent a stack overflow due to a continuous UI -> Property -> UI -> ... chain
         private bool _isBinding = false;
 
@@ -357,7 +356,7 @@
             }
         }
 
-        void OnBoundObjectPropertyChanged(object sender, PropertyChangedEventArgs e)
+        private void OnBoundObjectPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             if (_isBinding)
                 return;
@@ -383,4 +382,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolGraphicsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolGraphicsCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolGraphicsCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using Maestro.Editors.SymbolDefinition.GraphicsEditors;
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-using Maestro.Editors.SymbolDefinition.GraphicsEditors;
 
 namespace Maestro.Editors.SymbolDefinition
 {
@@ -145,4 +144,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 
 namespace Maestro.Editors.SymbolDefinition
 {
@@ -99,4 +97,4 @@
             _p.DataType = cmbDataType.SelectedItem.ToString();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Windows.Forms;
 
 namespace Maestro.Editors.SymbolDefinition
@@ -34,4 +31,4 @@
             InitializeComponent();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolPreviewDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolPreviewDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolPreviewDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
+//
+
+#endregion Disclaimer / License
+
 using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.SymbolDefinition
@@ -42,4 +39,4 @@
             pictureBox1.Image = img;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/UsageContextsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/UsageContextsCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/UsageContextsCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
+using System;
+using System.ComponentModel;
 
 namespace Maestro.Editors.SymbolDefinition
 {
@@ -169,4 +167,4 @@
             OnResourceChanged();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace Maestro.Editors.WatermarkDefinition
@@ -29,7 +29,7 @@
     /// editing Watermark Definitions
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/TilePositionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/TilePositionEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/TilePositionEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 
 namespace Maestro.Editors.WatermarkDefinition
 {
@@ -140,4 +139,4 @@
             _edSvc.MarkDirty();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Generic;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
-using Maestro.Shared.UI;
-using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Editors.WatermarkDefinition
 {
@@ -115,4 +112,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkContentCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkContentCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkContentCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using Maestro.Editors.SymbolDefinition.GraphicsEditors;
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
+using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
+using System;
+using System.ComponentModel;
 
 namespace Maestro.Editors.WatermarkDefinition
 {
@@ -81,7 +79,7 @@
                     //Text, I choose you
                     rdText.Checked = true;
                     CheckEditStates();
-                    
+
                     _text = _sym.CreateTextGraphics();
                     _image = _sym.CreateImageGraphics();
                     SetActiveGraphicElement(_text);
@@ -135,4 +133,4 @@
             OnResourceChanged();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkEditorCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkEditorCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
-using Maestro.Editors.SymbolDefinition;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 
 namespace Maestro.Editors.WatermarkDefinition
 {
@@ -60,4 +54,4 @@
             wmSettings.Bind(service);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
+using System;
+using System.ComponentModel;
 using System.Diagnostics;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.WatermarkDefinition
 {
@@ -49,7 +47,7 @@
             InitializeComponent();
             _edSvc = service;
             _watermark = watermark;
-            
+
             try
             {
                 _init = true;
@@ -103,12 +101,12 @@
                 _init = false;
             }
         }
-        
+
         private void TilePos_CheckedChanged(object sender, EventArgs e)
         {
             ovPosPanel.Controls.Clear();
             Control c = null;
-            if (rdOvPosXY.Checked) 
+            if (rdOvPosXY.Checked)
             {
                 c = new XYPositionEditor(_ovXyPosition, _edSvc);
             }
@@ -213,4 +211,4 @@
             _ovAppearance.Rotation = Convert.ToDouble(numOvRotation.Value);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditorDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditorDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditorDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 
 namespace Maestro.Editors.WatermarkDefinition
 {
@@ -51,4 +48,4 @@
             this.DialogResult = DialogResult.Cancel;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkSettingsCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkSettingsCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
-using Maestro.Shared.UI;
 
 namespace Maestro.Editors.WatermarkDefinition
 {
@@ -90,4 +89,4 @@
                 _wm.Position = _xy;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/XYPositionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/XYPositionEditor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/XYPositionEditor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 
 namespace Maestro.Editors.WatermarkDefinition
 {
@@ -118,4 +117,4 @@
             _edSvc.MarkDirty();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/CommandIconCache.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/CommandIconCache.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/CommandIconCache.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.WebLayout;
 using System.Drawing;
-using OSGeo.MapGuide.ObjectModels.WebLayout;
 
 namespace Maestro.Editors.WebLayout
 {
@@ -50,4 +50,4 @@
             return resMgr.GetObject(iconName, culture) as Bitmap;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/InvokeScriptCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/InvokeScriptCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/InvokeScriptCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.ObjectModels.WebLayout;
+using System.ComponentModel;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.WebLayout.Commands
 {
@@ -46,4 +44,4 @@
             TextBoxBinder.BindText(txtScript, invokeScriptCommandType, "Script");
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/InvokeURLCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/InvokeURLCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/InvokeURLCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
+using OSGeo.MapGuide.ObjectModels.WebLayout;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.WebLayout;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Editors.WebLayout.Commands
 {
@@ -74,12 +74,12 @@
             _cmd = invokeUrlCommandType;
         }
 
-        void OnAddingNew(object sender, AddingNewEventArgs e)
+        private void OnAddingNew(object sender, AddingNewEventArgs e)
         {
             e.NewObject = _cmd.CreateParameter("", "");
         }
 
-        void OnParamsListChanged(object sender, ListChangedEventArgs e)
+        private void OnParamsListChanged(object sender, ListChangedEventArgs e)
         {
             switch (e.ListChangedType)
             {
@@ -100,7 +100,7 @@
             base.UnsubscribeEventHandlers();
         }
 
-        void OnCommandPropertyChanged(object sender, PropertyChangedEventArgs e)
+        private void OnCommandPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             OnResourceChanged();
         }
@@ -132,4 +132,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/SearchCmdCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/SearchCmdCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/SearchCmdCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,37 +1,37 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
+using OSGeo.MapGuide.ObjectModels.WebLayout;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.WebLayout;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 
 namespace Maestro.Editors.WebLayout.Commands
 {
@@ -106,7 +106,7 @@
             _init = false;
         }
 
-        void OnAddingNewColumn(object sender, AddingNewEventArgs e)
+        private void OnAddingNewColumn(object sender, AddingNewEventArgs e)
         {
             if (_cls == null)
                 return;
@@ -114,7 +114,7 @@
             e.NewObject = _cmd.ResultColumns.CreateColumn("MyProperty", _cls.Properties[0].Name);
         }
 
-        void OnColumnsChanged(object sender, ListChangedEventArgs e)
+        private void OnColumnsChanged(object sender, ListChangedEventArgs e)
         {
             switch (e.ListChangedType)
             {
@@ -123,6 +123,7 @@
                         _cmd.ResultColumns.AddResultColumn(_columns[e.NewIndex]);
                     }
                     break;
+
                 case ListChangedType.Reset:
                     {
                         if (_cleanup)
@@ -158,7 +159,7 @@
             _layers = new List<IMapLayer>(map.MapLayer);
         }
 
-        void OnWebLayoutPropertyChanged(object sender, PropertyChangedEventArgs e)
+        private void OnWebLayoutPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             if (e.PropertyName == "ResourceId")
             {
@@ -213,9 +214,10 @@
             UpdateColumns();
         }
 
-        class LayerItem
+        private class LayerItem
         {
             public string ResourceId { get; set; }
+
             public string Name { get; set; }
         }
 
@@ -234,4 +236,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/CustomCommandPropertyCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/CustomCommandPropertyCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/CustomCommandPropertyCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.WebLayout.Commands;
+using OSGeo.MapGuide.ObjectModels.WebLayout;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using Maestro.Shared.UI;
-using OSGeo.MapGuide.ObjectModels.WebLayout;
-using Maestro.Editors.WebLayout.Commands;
 
 namespace Maestro.Editors.WebLayout
 {
@@ -166,4 +164,4 @@
             _cmd.Description = txtDescription.Text;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/MenuEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/MenuEditorCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/MenuEditorCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Aga.Controls.Tree;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.WebLayout;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using Aga.Controls.Tree;
-using OSGeo.MapGuide.ObjectModels.WebLayout;
-using System.Diagnostics;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.Editors.WebLayout
 {
@@ -72,7 +72,7 @@
             _wl.CommandSet.CustomCommandRemoved += OnCustomCommandRemoved;
             _rootMenu = menu;
             this.Model = _model = new MenuTreeModel(menu, wl);
-            
+
             InitBuiltinCommandMenu();
             InitCustomCommandMenu();
         }
@@ -84,7 +84,7 @@
             RefreshModel();
         }
 
-        void OnCustomCommandRemoved(ICommand cmd)
+        private void OnCustomCommandRemoved(ICommand cmd)
         {
             RemoveCustomCommandEntry(mnuCustom, cmd);
 
@@ -92,7 +92,7 @@
             RefreshModel();
         }
 
-        void OnCustomCommandAdded(ICommand cmd)
+        private void OnCustomCommandAdded(ICommand cmd)
         {
             AddCustomCommandEntry(mnuCustom, cmd);
         }
@@ -306,7 +306,7 @@
         private void btnDelete_Click(object sender, EventArgs e)
         {
             int removed = 0;
-            if (trvMenuItems.SelectedNode != null) 
+            if (trvMenuItems.SelectedNode != null)
             {
                 var it = trvMenuItems.SelectedNode.Tag as ItemBase;
                 if (it != null)
@@ -465,4 +465,4 @@
             e.Effect = DragDropEffects.Move;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/MenuModel.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/MenuModel.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/MenuModel.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Aga.Controls.Tree;
+using OSGeo.MapGuide.ObjectModels.WebLayout;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using Aga.Controls.Tree;
-using OSGeo.MapGuide.ObjectModels.WebLayout;
 using System.Diagnostics;
 using System.Drawing;
 
@@ -38,7 +40,10 @@
 
     internal abstract class ItemBase<T> : ItemBase where T : IUIItem
     {
-        protected ItemBase(T item) { this.Tag = item; }
+        protected ItemBase(T item)
+        {
+            this.Tag = item;
+        }
 
         public T Tag
         {
@@ -197,4 +202,4 @@
 
         public event EventHandler<TreePathEventArgs> StructureChanged;
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace Maestro.Editors.WebLayout
@@ -28,7 +28,7 @@
     /// The <c>Maestro.Editors.WebLayout</c> namespace provides UI components for editing Web Layout documents
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayout3SettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayout3SettingsCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayout3SettingsCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,30 @@
 #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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using OSGeo.MapGuide.ObjectModels.WebLayout;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.WebLayout;
 
 namespace Maestro.Editors.WebLayout
 {
@@ -113,4 +111,4 @@
             _wl.StartupScript = txtStartupScript.Text;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutCommandsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutCommandsCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutCommandsCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.ObjectModels.WebLayout;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
 using System.Text;
 using System.Windows.Forms;
-using Maestro.Shared.UI;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.WebLayout;
-using OSGeo.MapGuide.ObjectModels;
 
 namespace Maestro.Editors.WebLayout
 {
@@ -70,7 +70,7 @@
 
         private bool listChangedDisabled = false;
 
-        void OnCommandSetListChanged(object sender, ListChangedEventArgs e)
+        private void OnCommandSetListChanged(object sender, ListChangedEventArgs e)
         {
             if (listChangedDisabled)
                 return;
@@ -393,14 +393,17 @@
     //So use a concrete decorator class that wraps the internal interface and bind to that
     //instead
 
-    class CommandDecorator
+    internal class CommandDecorator
     {
         private ICommand _cmd;
 
         [Browsable(false)]
         internal ICommand DecoratedInstance { get { return _cmd; } }
 
-        public CommandDecorator(ICommand cmd) { _cmd = cmd; }
+        public CommandDecorator(ICommand cmd)
+        {
+            _cmd = cmd;
+        }
 
         public string Name
         {
@@ -523,4 +526,4 @@
 
         public event PropertyChangedEventHandler PropertyChanged;
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutEditorCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutEditorCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using Maestro.Shared.UI;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.WebLayout;
 
 namespace Maestro.Editors.WebLayout
@@ -65,4 +60,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Common;
+using OSGeo.MapGuide.ObjectModels.WebLayout;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using Maestro.Shared.UI;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.WebLayout;
-using Aga.Controls.Tree;
-using System.Diagnostics;
 
 namespace Maestro.Editors.WebLayout
 {
@@ -72,7 +69,7 @@
             _wl.CommandSet.CustomCommandRemoved -= OnCommandRemoved;
         }
 
-        void OnCommandRemoved(ICommand cmd)
+        private void OnCommandRemoved(ICommand cmd)
         {
             if (_cmdsByName.ContainsKey(cmd.Name))
             {
@@ -82,7 +79,7 @@
             }
         }
 
-        void OnCommandAdded(ICommand cmd)
+        private void OnCommandAdded(ICommand cmd)
         {
             var dec = new CommandDecorator(cmd);
             _cmds.Add(dec);
@@ -141,4 +138,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
 using Maestro.Editors.Generic;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.WebLayout;
+using System;
+using System.ComponentModel;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.WebLayout
 {
@@ -60,14 +58,14 @@
 
             _wl = (IWebLayout)_edsvc.GetEditedResource();
             GeneratePreviewUrl();
-            
+
             _view = _wl.Map.InitialView;
             if (_view == null)
             {
                 _view = _wl.CreateDefaultView();
                 chkCustomView.Checked = false;
             }
-            else 
+            else
             {
                 chkCustomView.Checked = true;
             }
@@ -82,7 +80,7 @@
             TextBoxBinder.BindText(numX, _view, "CenterX");
             TextBoxBinder.BindText(numY, _view, "CenterY");
             TextBoxBinder.BindText(numScale, _view, "Scale");
-            
+
             TextBoxBinder.BindText(txtBrowserTitle, _wl, "Title");
             TextBoxBinder.BindText(txtMapDefinition, _wl.Map, "ResourceId");
             TextBoxBinder.BindText(txtInitialTaskPaneUrl, _wl.TaskPane, "InitialTask");
@@ -147,12 +145,12 @@
             catch { }
         }
 
-        void OnSaved(object sender, EventArgs e)
+        private void OnSaved(object sender, EventArgs e)
         {
             GeneratePreviewUrl();
         }
 
-        void OnWebLayoutPropertyChanged(object sender, PropertyChangedEventArgs e)
+        private void OnWebLayoutPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             OnResourceChanged();
         }
@@ -243,4 +241,4 @@
             _edsvc.OpenUrl(txtAjaxViewerUrl.Text);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/packages.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Editors/packages.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
-  <package id="TreeViewAdv" version="1.7.0.0" targetFramework="net40" />
+    <package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
+    <package id="TreeViewAdv" version="1.7.0.0" targetFramework="net40" />
 </packages>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.LiveMapEditor/AboutDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.LiveMapEditor/AboutDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/AboutDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Linq;
 using System.Reflection;
 using System.Windows.Forms;
 
@@ -118,6 +117,7 @@
                 return ((AssemblyCompanyAttribute)attributes[0]).Company;
             }
         }
-        #endregion
+
+        #endregion Assembly Attribute Accessors
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.LiveMapEditor/MainForm.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.LiveMapEditor/MainForm.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/MainForm.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,40 +1,36 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Generic;
 using Maestro.Editors.MapDefinition;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Mapping;
 using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.ObjectModels.Common;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.MaestroAPI.Mapping;
+using System;
 using System.Diagnostics;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.ObjectModels.Common;
+using System.Windows.Forms;
 
 namespace Maestro.LiveMapEditor
 {
@@ -132,7 +128,7 @@
                    runtimeMap.SupportsMutableMetersPerUnit;
         }
 
-        void OnMapLayerAdded(object sender, RuntimeMapLayer layer)
+        private void OnMapLayerAdded(object sender, RuntimeMapLayer layer)
         {
             if (_bComputeLayerCsAndExtentOnFirstLayerAdded && _mapEditor.Map.Layers.Count == 1)
             {
@@ -192,7 +188,7 @@
             }
         }
 
-        void OnMapCoordSysAndExtentsChangedFromFirstLayer(object sender, EventArgs e)
+        private void OnMapCoordSysAndExtentsChangedFromFirstLayer(object sender, EventArgs e)
         {
             _mapEditor.ReloadViewer();
         }
@@ -306,4 +302,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.LiveMapEditor/MapSettingsDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.LiveMapEditor/MapSettingsDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/MapSettingsDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,37 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using System.Globalization;
-using OSGeo.MapGuide.ObjectModels;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors.Common;
 using Maestro.Editors.MapDefinition;
 using Maestro.MapViewer;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
+using System;
+using System.Globalization;
+using System.Windows.Forms;
 
 namespace Maestro.LiveMapEditor
 {
@@ -97,7 +94,7 @@
                 MessageBox.Show(Strings.ErrInvalidExtents);
                 return false;
             }
-            else 
+            else
             {
                 _mdf.Extents = ObjectFactory.CreateEnvelope(llx, lly, urx, ury);
             }
@@ -158,4 +155,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.LiveMapEditor/Program.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.LiveMapEditor/Program.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/Program.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,39 +1,37 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors.Preview;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.ExtendedObjectModels;
-using Maestro.Editors.Preview;
+using System;
 using System.Diagnostics;
-using System.Reflection;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
+using System.Windows.Forms;
 
 namespace Maestro.LiveMapEditor
 {
-    static class Program
+    internal static class Program
     {
-        class OurUrlLauncher : IUrlLauncherService
+        private class OurUrlLauncher : IUrlLauncherService
         {
             public void OpenUrl(string url)
             {
@@ -45,7 +43,7 @@
         /// The main entry point for the application.
         /// </summary>
         [STAThread]
-        static void Main()
+        private static void Main()
         {
             ModelSetup.Initialize();
             Application.EnableVisualStyles();
@@ -92,7 +90,6 @@
             }
             catch (Exception ex)
             {
-
             }
              */
 
@@ -106,9 +103,9 @@
             }
         }
 
-        static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)
+        private static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)
         {
             ErrorDialog.Show(e.Exception);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.LiveMapEditor/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.LiveMapEditor/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Maestro.LiveMapEditor")]
@@ -11,10 +10,10 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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("d1af8726-5e7c-4ae7-9036-9acccace69f8")]
+[assembly: Guid("d1af8726-5e7c-4ae7-9036-9acccace69f8")]
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.LiveMapEditor/ResourceEditorService.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.LiveMapEditor/ResourceEditorService.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/ResourceEditorService.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Editors;
-using System.Diagnostics;
 using OSGeo.MapGuide.MaestroAPI;
+using System;
+using System.Diagnostics;
 
 namespace Maestro.LiveMapEditor
 {
-    
     public class ResourceEditorService : ResourceEditorServiceBase
     {
         public ResourceEditorService(string resourceID, IServerConnection conn)
@@ -64,4 +63,4 @@
             throw new NotImplementedException();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.LiveMapEditor/app.config
===================================================================
--- trunk/Tools/Maestro/Maestro.LiveMapEditor/app.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/app.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <configuration>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
-  </startup>
-  <!-- 
-  Uncomment the section below for proxy server support. 
-  
-  Note this doesn't work in Mono (see http://trac.osgeo.org/mapguide/ticket/2414)  
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+    </startup>
+    <!--
+  Uncomment the section below for proxy server support.
+
+  Note this doesn't work in Mono (see http://trac.osgeo.org/mapguide/ticket/2414)
   -->
-  <!--
+    <!--
   <system.net>
     <defaultProxy useDefaultCredentials="true" />
   </system.net>
   -->
-</configuration>
+</configuration>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Login/HttpLoginCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Login/HttpLoginCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Login/HttpLoginCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
 using System.Globalization;
-using OSGeo.MapGuide.MaestroAPI;
+using System.Windows.Forms;
 
 namespace Maestro.Login
 {
@@ -118,7 +117,7 @@
             set { txtPassword.Text = value; }
         }
 
-        #endregion
+        #endregion ILoginCtrl Members
 
         public string Server
         {
@@ -134,8 +133,8 @@
 
         public string Language
         {
-            get 
-            { 
+            get
+            {
                 var ci = cmbLanguage.SelectedItem as CultureInfo;
                 if (ci != null)
                 {
@@ -220,11 +219,11 @@
         }
     }
 
-    static class DefaultValues
+    internal static class DefaultValues
     {
         public const string Server = "http://localhost/mapguide/mapagent/mapagent.fcgi"; //NOXLATE
         public const string StartingPoint = StringConstants.RootIdentifier;
         public const string Username = "Administrator"; //NOXLATE
         public const string Password = "admin"; //NOXLATE
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Login/ILoginCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Login/ILoginCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Login/ILoginCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Maestro.Login
 {
@@ -33,6 +34,7 @@
         /// </summary>
         /// <value>The username.</value>
         string Username { get; }
+
         /// <summary>
         /// Gets the password.
         /// </summary>
@@ -48,13 +50,15 @@
         /// Occurs when [enable ok].
         /// </summary>
         event EventHandler EnableOk;
+
         /// <summary>
         /// Occurs when [disabled ok].
         /// </summary>
         event EventHandler DisabledOk;
+
         /// <summary>
         /// Occurs when [check saved password].
         /// </summary>
         event EventHandler CheckSavedPassword;
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Login/LocalLoginCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Login/LocalLoginCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Login/LocalLoginCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using Maestro.Shared.UI;
+using System;
 using System.IO;
+using System.Windows.Forms;
 
 namespace Maestro.Login
 {
@@ -115,4 +113,4 @@
         /// </summary>
         public event EventHandler CheckSavedPassword;
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Login/LocalNativeLoginCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Login/LocalNativeLoginCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Login/LocalNativeLoginCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
 using System.IO;
-using Maestro.Shared.UI;
+using System.Windows.Forms;
 
 namespace Maestro.Login
 {
@@ -56,7 +54,7 @@
             get { return txtPassword.Text; }
         }
 
-        #endregion
+        #endregion ILoginCtrl Members
 
         public string WebConfigPath
         {
@@ -87,7 +85,7 @@
             using (var dlg = DialogFactory.OpenFile())
             {
                 dlg.InitialDirectory = Application.StartupPath;
-                //WTF does this default to false??? Does MS not realize that changing directories 
+                //WTF does this default to false??? Does MS not realize that changing directories
                 //via this dialog absolutely screws up file/assembly loading from relative paths?
                 dlg.RestoreDirectory = true;
                 dlg.Filter = string.Format(OSGeo.MapGuide.MaestroAPI.Strings.GenericFilter, OSGeo.MapGuide.MaestroAPI.Strings.PickIni, "ini"); //NOXLATE
@@ -98,4 +96,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Login/LocalNativeStubCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Login/LocalNativeStubCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Login/LocalNativeStubCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Login
@@ -72,4 +69,4 @@
 
         public event EventHandler CheckSavedPassword;
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Login/LocalStubCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Login/LocalStubCtrl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Login/LocalStubCtrl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Login
@@ -65,4 +62,4 @@
 
         public event EventHandler CheckSavedPassword;
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Login/LoginDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Login/LoginDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Login/LoginDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using System.Reflection;
+using System;
 using System.Collections.Specialized;
+using System.Reflection;
+using System.Windows.Forms;
 
 namespace Maestro.Login
 {
@@ -59,7 +57,7 @@
             _local = new LocalLoginCtrl() { Dock = DockStyle.Fill };
             _localNativeStub = new LocalNativeStubCtrl() { Dock = DockStyle.Fill };
             _localStub = new LocalStubCtrl() { Dock = DockStyle.Fill };
-            _controls = new ILoginCtrl[] 
+            _controls = new ILoginCtrl[]
             {
                 _http,
                 _localNative,
@@ -288,7 +286,6 @@
                         }
                         catch (Exception)
                         {
-
                         }
                     }
                     else if (_selectedIndex == 1) //Native
@@ -309,13 +306,10 @@
 
                     _conn.AutoRestartSession = true;
 
-
-
                     this.DialogResult = DialogResult.OK;
                     this.Close();
-
                 }
-                catch (TargetInvocationException ex) 
+                catch (TargetInvocationException ex)
                 {
                     //We don't care about the outer exception
                     string msg = ex.InnerException.Message;
@@ -368,4 +362,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Login/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Login/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Login/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace Maestro.Login
@@ -29,7 +29,7 @@
     /// instance from user input.
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Login/PreferedSite.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Login/PreferedSite.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Login/PreferedSite.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Windows.Forms;
 
 namespace Maestro.Login
 {
-
     /// <summary>
     /// Simple list style container for sites
     /// </summary>
@@ -46,11 +48,11 @@
         /// <value>The sites.</value>
         public PreferedSite[] Sites
         {
-            get 
-            { 
+            get
+            {
                 if (m_sites == null)
                     m_sites = new PreferedSite[0];
-                return m_sites; 
+                return m_sites;
             }
             set { m_sites = value; }
         }
@@ -84,7 +86,7 @@
         [System.Xml.Serialization.XmlAttribute()]
         public string SystemBrowser
         {
-            get 
+            get
             {
                 if (string.IsNullOrEmpty(m_systemBrowser))
                 {
@@ -96,12 +98,11 @@
                         m_systemBrowser = "firefox";
                 }
 
-                return m_systemBrowser; 
+                return m_systemBrowser;
             }
             set { m_systemBrowser = value; }
         }
 
-
         /// <summary>
         /// Gets or sets the prefered site.
         /// </summary>
@@ -188,7 +189,7 @@
             //A generic collection would be nice :/
             PreferedSite[] n = new PreferedSite[m_sites.Length + 1];
             Array.Copy(m_sites, 0, n, 0, m_sites.Length);
-            n[n.Length-1] = site;
+            n[n.Length - 1] = site;
             m_sites = n;
         }
 
@@ -354,11 +355,11 @@
         [System.Xml.Serialization.XmlIgnore()]
         public Version ApprovedVersion
         {
-            get 
+            get
             {
                 if (m_approvedVersion == null)
                     m_approvedVersion = new Version(0, 0, 0, 0);
-                return m_approvedVersion; 
+                return m_approvedVersion;
             }
             set { m_approvedVersion = value; }
         }
@@ -374,7 +375,6 @@
             set { m_scrambledPassword = Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(value)); }
         }
 
-
         /// <summary>
         /// Returns a <see cref="System.String"/> that represents this instance.
         /// </summary>
@@ -385,6 +385,5 @@
         {
             return m_siteURL;
         }
-
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Login/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Login/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Login/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Maestro.Login")]
@@ -11,8 +10,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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)]
 

Modified: trunk/Tools/Maestro/Maestro.Login/WaitCursor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Login/WaitCursor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Login/WaitCursor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,67 +1,70 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Windows.Forms;
 
 namespace Maestro.Login
 {
-	/// <summary>
-	/// A class that wraps the wait cursor into a disposable class, for use with deterministic disposal
-	/// </summary>
-	public class WaitCursor 
-		: IDisposable
-	{
-		private Form m_owner = null;
-		private Cursor m_oldcursor;
+    /// <summary>
+    /// A class that wraps the wait cursor into a disposable class, for use with deterministic disposal
+    /// </summary>
+    public class WaitCursor
+        : IDisposable
+    {
+        private Form m_owner = null;
+        private Cursor m_oldcursor;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="WaitCursor"/> class.
         /// </summary>
         /// <param name="owner">The owner.</param>
-		public WaitCursor(Form owner)
-		{
-			//This ensures that nested WaitCursors behave as expected.
-			//If we are the outermost WaitCursor, set the cursor
-			if (owner.Cursor != Cursors.WaitCursor)
-			{
-				m_oldcursor = owner.Cursor;
-				m_owner = owner;
-				m_owner.Cursor = Cursors.WaitCursor;
-			}
-		}
+        public WaitCursor(Form owner)
+        {
+            //This ensures that nested WaitCursors behave as expected.
+            //If we are the outermost WaitCursor, set the cursor
+            if (owner.Cursor != Cursors.WaitCursor)
+            {
+                m_oldcursor = owner.Cursor;
+                m_owner = owner;
+                m_owner.Cursor = Cursors.WaitCursor;
+            }
+        }
 
-		#region IDisposable Members
+        #region IDisposable Members
 
         /// <summary>
         /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
-		public void Dispose()
-		{
-			//If we are the the outermost WaitCursor, reset the cursor
-			if (m_owner != null && m_owner.Cursor == Cursors.WaitCursor)
-			{
-				m_owner.Cursor = m_oldcursor;
-				m_owner = null;
-			}
-		}
+        public void Dispose()
+        {
+            //If we are the the outermost WaitCursor, reset the cursor
+            if (m_owner != null && m_owner.Cursor == Cursors.WaitCursor)
+            {
+                m_owner.Cursor = m_oldcursor;
+                m_owner = null;
+            }
+        }
 
-		#endregion
-	}
-}
+        #endregion IDisposable Members
+    }
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.MapViewer/CoreTypes.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.MapViewer/CoreTypes.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.MapViewer/CoreTypes.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Drawing;
 
 namespace Maestro.MapViewer
@@ -104,7 +104,7 @@
     public class MapPointEventArgs : EventArgs
     {
         /// <summary>
-        /// Gets the X coordinate 
+        /// Gets the X coordinate
         /// </summary>
         public readonly double X;
 
@@ -114,7 +114,7 @@
         public readonly double Y;
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="x"></param>
         /// <param name="y"></param>
@@ -134,26 +134,32 @@
         /// No digitization in progress
         /// </summary>
         None,
+
         /// <summary>
         /// A point digitization is in progress
         /// </summary>
         Point,
+
         /// <summary>
         /// A line digitization is in progress
         /// </summary>
         Line,
+
         /// <summary>
         /// A line string digitization is in progress
         /// </summary>
         LineString,
+
         /// <summary>
         /// A rectangle digitization is in progress
         /// </summary>
         Rectangle,
+
         /// <summary>
         /// A polygon digitization is in progress
         /// </summary>
         Polygon,
+
         /// <summary>
         /// A circle digitization is in progress
         /// </summary>
@@ -169,18 +175,22 @@
         /// Zoom In command
         /// </summary>
         ZoomIn,
+
         /// <summary>
         /// Zoom Out command
         /// </summary>
         ZoomOut,
+
         /// <summary>
         /// Pan command
         /// </summary>
         Pan,
+
         /// <summary>
         /// Select command
         /// </summary>
         Select,
+
         /// <summary>
         /// No active command
         /// </summary>
@@ -214,4 +224,4 @@
         /// </summary>
         public Color Color { get; private set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.MapViewer/DefaultToolbar.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.MapViewer/DefaultToolbar.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.MapViewer/DefaultToolbar.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.ComponentModel;
 using System.Text;
-using System.ComponentModel;
 using System.Windows.Forms;
 
 namespace Maestro.MapViewer
@@ -168,7 +169,7 @@
 
         internal ToolStripButton ZoomIn { get; private set; }
 
-        void OnZoomIn(object sender, EventArgs e)
+        private void OnZoomIn(object sender, EventArgs e)
         {
             if (_viewer == null)
                 return;
@@ -178,7 +179,7 @@
 
         internal ToolStripButton ZoomOut { get; private set; }
 
-        void OnZoomOut(object sender, EventArgs e)
+        private void OnZoomOut(object sender, EventArgs e)
         {
             if (_viewer == null)
                 return;
@@ -198,7 +199,7 @@
 
         internal ToolStripButton ZoomExtents { get; private set; }
 
-        void OnZoomExtents(object sender, EventArgs e)
+        private void OnZoomExtents(object sender, EventArgs e)
         {
             if (_viewer == null)
                 return;
@@ -208,7 +209,7 @@
 
         internal ToolStripButton SelectTool { get; private set; }
 
-        void OnSelect(object sender, EventArgs e)
+        private void OnSelect(object sender, EventArgs e)
         {
             if (_viewer == null)
                 return;
@@ -218,7 +219,7 @@
 
         internal ToolStripButton Pan { get; private set; }
 
-        void OnPan(object sender, EventArgs e)
+        private void OnPan(object sender, EventArgs e)
         {
             if (_viewer == null)
                 return;
@@ -228,7 +229,7 @@
 
         internal ToolStripButton ClearSelection { get; private set; }
 
-        void OnClearSelection(object sender, EventArgs e)
+        private void OnClearSelection(object sender, EventArgs e)
         {
             if (_viewer == null)
                 return;
@@ -238,7 +239,7 @@
 
         internal ToolStripButton SelectRadius { get; private set; }
 
-        void OnSelectRadius(object sender, EventArgs e)
+        private void OnSelectRadius(object sender, EventArgs e)
         {
             if (_viewer == null)
                 return;
@@ -251,7 +252,7 @@
 
         internal ToolStripButton SelectPolygon { get; private set; }
 
-        void OnSelectPolygon(object sender, EventArgs e)
+        private void OnSelectPolygon(object sender, EventArgs e)
         {
             if (_viewer == null)
                 return;
@@ -272,7 +273,7 @@
 
         internal ToolStripButton RefreshMap { get; private set; }
 
-        void OnRefreshMap(object sender, EventArgs e)
+        private void OnRefreshMap(object sender, EventArgs e)
         {
             if (_viewer == null)
                 return;
@@ -282,7 +283,7 @@
 
         internal ToolStripButton ToggleTooltips { get; private set; }
 
-        void OnToggleTooltips(object sender, EventArgs e)
+        private void OnToggleTooltips(object sender, EventArgs e)
         {
             if (_viewer == null)
                 return;
@@ -293,7 +294,7 @@
 
         internal ToolStripButton CopyMap { get; private set; }
 
-        void OnCopyMap(object sender, EventArgs e)
+        private void OnCopyMap(object sender, EventArgs e)
         {
             if (_viewer == null)
                 return;
@@ -350,12 +351,12 @@
             }
         }
 
-        static string MakeWktPolygon(double x1, double y1, double x2, double y2)
+        private static string MakeWktPolygon(double x1, double y1, double x2, double y2)
         {
             return "POLYGON((" + x1 + " " + y1 + ", " + x2 + " " + y1 + ", " + x2 + " " + y2 + ", " + x1 + " " + y2 + ", " + x1 + " " + y1 + "))";
         }
 
-        static string MakeWktCircle(double x, double y, double r)
+        private static string MakeWktCircle(double x, double y, double r)
         {
             return "CURVEPOLYGON ((" + (x - r) + " " + y + " (CIRCULARARCSEGMENT (" + x + " " + (y - r) + ", " + (x + r) + " " + y + "), CIRCULARARCSEGMENT (" + x + " " + (y + r) + ", " + (x - r) + " " + y + "))))";
         }
@@ -370,9 +371,10 @@
         /// The user must click on the map to zoom out from that selected point
         /// </summary>
         ClickToZoom,
+
         /// <summary>
         /// The map automatically zooms out on command invocation
         /// </summary>
         AutoZoom
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.MapViewer/Interfaces.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.MapViewer/Interfaces.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.MapViewer/Interfaces.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using OSGeo.MapGuide.ObjectModels.Common;
-using System.Drawing;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Mapping;
-using System.ComponentModel;
+using System;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Drawing;
 
 namespace Maestro.MapViewer
 {
@@ -208,7 +207,7 @@
 
         /// <summary>
         /// Raised when the viewer has started refreshing the map. This is to allow
-        /// any actions dependent on map state to update themselves asynchronously 
+        /// any actions dependent on map state to update themselves asynchronously
         /// without needing to wait for the updated map to be rendered.
         /// </summary>
         event EventHandler MapRefreshing;
@@ -318,11 +317,10 @@
         /// </summary>
         bool ConvertTiledGroupsToNonTiled { get; set; }
 
-
         /// <summary>
         /// Gets whether to use the RenderMap API instead of RenderDynamicOverlay if the map has tiled
         /// layers. RenderMap includes tiled layers as part of the output image, but will not take advantage
-        /// of any tile caching mechanisms. Setting this property to true nullifies any effect of the 
+        /// of any tile caching mechanisms. Setting this property to true nullifies any effect of the
         /// <see cref="P:Maestro.MapViewer.IMapViewer.ConvertTiledGroupsToNonTiled"/> property
         /// </summary>
         bool UseRenderMapIfTiledLayersExist { get; set; }
@@ -383,4 +381,4 @@
         /// </summary>
         IMapViewer Viewer { get; set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.MapViewer/Legend.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.MapViewer/Legend.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.MapViewer/Legend.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,42 +1,38 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.MapViewer.Model;
+using OSGeo.MapGuide.MaestroAPI.Mapping;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Mapping;
-using System.Windows.Forms.VisualStyles;
-using System.Diagnostics;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using System.Xml;
-using System.IO;
-using Maestro.MapViewer.Model;
 
 namespace Maestro.MapViewer
 {
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <param name="sender"></param>
     /// <param name="node"></param>
@@ -47,14 +43,14 @@
     /// </summary>
     public partial class Legend : UserControl, INotifyPropertyChanged
     {
-        const string IMG_BROKEN = "lc_broken";
-        const string IMG_DWF = "lc_dwf";
-        const string IMG_GROUP = "lc_group";
-        const string IMG_RASTER = "lc_raster";
-        const string IMG_SELECT = "lc_select";
-        const string IMG_THEME = "lc_theme";
-        const string IMG_UNSELECT = "lc_unselect";
-        const string IMG_OTHER = "icon_etc";
+        private const string IMG_BROKEN = "lc_broken";
+        private const string IMG_DWF = "lc_dwf";
+        private const string IMG_GROUP = "lc_group";
+        private const string IMG_RASTER = "lc_raster";
+        private const string IMG_SELECT = "lc_select";
+        private const string IMG_THEME = "lc_theme";
+        private const string IMG_UNSELECT = "lc_unselect";
+        private const string IMG_OTHER = "icon_etc";
 
         private RuntimeMap _map;
 
@@ -70,7 +66,7 @@
             this.ThemeCompressionLimit = 25;
             this.ShowAllLayersAndGroups = false;
         }
-        
+
         /// <summary>
         /// Raised when item dragging occurs
         /// </summary>
@@ -91,7 +87,7 @@
         {
             get { return _viewer; }
             set
-            { 
+            {
                 _viewer = value;
                 if (_viewer != null && !this.DesignMode)
                 {
@@ -105,7 +101,7 @@
             }
         }
 
-        void OnViewerPropertyChanged(object sender, PropertyChangedEventArgs e)
+        private void OnViewerPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             if (e.PropertyName == "IsBusy")
             {
@@ -117,13 +113,13 @@
             }
         }
 
-        void OnMapLoaded(object sender, EventArgs e)
+        private void OnMapLoaded(object sender, EventArgs e)
         {
             _map = _viewer.GetMap();
             _presenter = new LegendControlPresenter(this, _map);
         }
 
-        void OnMapRefreshing(object sender, EventArgs e)
+        private void OnMapRefreshing(object sender, EventArgs e)
         {
             this.RefreshLegend();
         }
@@ -163,7 +159,7 @@
         private Stopwatch _legendUpdateStopwatch = new Stopwatch();
 
         private bool _busy = false;
-        
+
         /// <summary>
         /// Gets whether the viewer is currently busy
         /// </summary>
@@ -245,7 +241,7 @@
             }
         }
 
-        static IEnumerable<TreeNode> AsEnumerable(TreeNodeCollection nodes)
+        private static IEnumerable<TreeNode> AsEnumerable(TreeNodeCollection nodes)
         {
             for (int i = 0; i < nodes.Count; i++)
             {
@@ -411,7 +407,6 @@
 
         private void OnGroupContextMenuOpening(object sender, CancelEventArgs e)
         {
-
         }
 
         /// <summary>
@@ -453,7 +448,6 @@
 
         private void OnLayerContextMenuOpening(object sender, CancelEventArgs e)
         {
-
         }
 
         private void trvLegend_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
@@ -461,12 +455,11 @@
             trvLegend.SelectedNode = e.Node;
             var meta = e.Node.Tag as LayerNodeMetadata;
 
-
             if (meta != null && meta.DrawSelectabilityIcon)
             {
                 //Toggle layer's selectability if it's within the bounds of the selectability icon
                 var box = new Rectangle(
-                    new Point((e.Node.Bounds.Location.X - 36) + 16, e.Node.Bounds.Location.Y), 
+                    new Point((e.Node.Bounds.Location.X - 36) + 16, e.Node.Bounds.Location.Y),
                     new Size(16, e.Node.Bounds.Height));
 
                 //Uncheckable items need to move 16px to the left
@@ -578,4 +571,4 @@
                 h(this, e);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.MapViewer/LegendPresenter.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.MapViewer/LegendPresenter.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.MapViewer/LegendPresenter.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,22 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using Maestro.MapViewer.Model;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Mapping;
@@ -26,24 +29,22 @@
 using System.Diagnostics;
 using System.Drawing;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 using System.Windows.Forms.VisualStyles;
 using System.Xml;
 
 namespace Maestro.MapViewer
 {
-    class LegendControlPresenter
+    internal class LegendControlPresenter
     {
-        const string IMG_BROKEN = "lc_broken";
-        const string IMG_DWF = "lc_dwf";
-        const string IMG_GROUP = "lc_group";
-        const string IMG_RASTER = "lc_raster";
-        const string IMG_SELECT = "lc_select";
-        const string IMG_THEME = "lc_theme";
-        const string IMG_UNSELECT = "lc_unselect";
-        const string IMG_OTHER = "icon_etc";
+        private const string IMG_BROKEN = "lc_broken";
+        private const string IMG_DWF = "lc_dwf";
+        private const string IMG_GROUP = "lc_group";
+        private const string IMG_RASTER = "lc_raster";
+        private const string IMG_SELECT = "lc_select";
+        private const string IMG_THEME = "lc_theme";
+        private const string IMG_UNSELECT = "lc_unselect";
+        private const string IMG_OTHER = "icon_etc";
 
         private IResourceService _resSvc;
         private IServerConnection _provider;
@@ -113,7 +114,7 @@
             return true;
         }
 
-        class RuleData
+        private class RuleData
         {
             public int GeomType;
             public XmlNodeList RuleNodes;
@@ -458,7 +459,6 @@
             }
             else
             {
-
             }
         }
 
@@ -848,7 +848,7 @@
                         e.Graphics.DrawRectangle(new Pen(Brushes.Black, 2.0f), rect);
                     }
                 }
-               
+
                 if (layerMeta != null)
                 {
                     if (bDrawSelection)
@@ -883,7 +883,7 @@
                     else
                     {
                         layerIcon = layerMeta.GetDefaultIcon(currentScale);
-                        if (layerIcon == null &&_legend.ShowAllLayersAndGroups)
+                        if (layerIcon == null && _legend.ShowAllLayersAndGroups)
                             layerIcon = Properties.Resources.lc_broken;
                     }
                     if (layerIcon != null)
@@ -1029,7 +1029,10 @@
             /// Gets the associated group
             /// </summary>
             /// <returns></returns>
-            public RuntimeMapGroup GetGroup() { return this.Group; }
+            public RuntimeMapGroup GetGroup()
+            {
+                return this.Group;
+            }
 
             internal GroupNodeMetadata(RuntimeMapGroup group)
             {
@@ -1061,7 +1064,7 @@
                 get { return this.Group.ObjectId; }
             }
         }
-        
+
         /// <summary>
         /// Layer theme node metadata
         /// </summary>
@@ -1080,7 +1083,7 @@
             /// Gets whether this node is a placeholder
             /// </summary>
             public bool IsPlaceholder { get; private set; }
-            
+
             /// <summary>
             /// Gets the icon for this theme node
             /// </summary>
@@ -1424,4 +1427,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.MapViewer/MapStatusTracker.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.MapViewer/MapStatusTracker.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.MapViewer/MapStatusTracker.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.ComponentModel;
 using System.Windows.Forms;
 
@@ -39,7 +39,7 @@
         public IMapViewer Viewer
         {
             get { return _viewer; }
-            set 
+            set
             {
                 if (_viewer != null)
                     UnwireViewer(_viewer);
@@ -80,7 +80,7 @@
             viewer.MapRefreshed -= OnMapRefreshed;
         }
 
-        void OnMapRefreshed(object sender, EventArgs e)
+        private void OnMapRefreshed(object sender, EventArgs e)
         {
             if (this.ScaleLabel == null)
                 return;
@@ -90,7 +90,7 @@
                 this.ScaleLabel.Text = string.Format("1:{0:0.00000}", map.ViewScale);
         }
 
-        void OnMapSelectionChanged(object sender, EventArgs e)
+        private void OnMapSelectionChanged(object sender, EventArgs e)
         {
             if (this.SelectedLabel == null)
                 return;
@@ -111,7 +111,7 @@
             }
         }
 
-        void OnMapPositionChanged(object sender, MapPointEventArgs e)
+        private void OnMapPositionChanged(object sender, MapPointEventArgs e)
         {
             if (this.CoordinatesLabel == null)
                 return;
@@ -119,7 +119,7 @@
             this.CoordinatesLabel.Text = string.Format(Properties.Resources.TextCoordinatePosition, e.X, e.Y);
         }
 
-        void OnMapScaleChanged(object sender, EventArgs e)
+        private void OnMapScaleChanged(object sender, EventArgs e)
         {
             if (this.ScaleLabel == null)
                 return;
@@ -129,4 +129,4 @@
                 this.ScaleLabel.Text = string.Format("1:{0:0.00000}", map.ViewScale);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.MapViewer/MapViewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.MapViewer/MapViewer.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.MapViewer/MapViewer.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,41 +1,39 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Mapping;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using System.Windows.Forms;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Diagnostics;
 using System.Drawing;
-using System.ComponentModel;
 using System.IO;
-using System.Drawing.Drawing2D;
-using System.Diagnostics;
-using System.Threading;
+using System.Windows.Forms;
 using System.Xml;
-using System.Collections.Specialized;
-using System.Collections.ObjectModel;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI.Mapping;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace Maestro.MapViewer
 {
@@ -79,7 +77,7 @@
             }
         }
 
-        const double MINIMUM_ZOOM_SCALE = 5.0;
+        private const double MINIMUM_ZOOM_SCALE = 5.0;
 
 #if VIEWER_DEBUG
         private MgdLayer _debugLayer;
@@ -125,7 +123,7 @@
             var debugLayerId = new MgResourceIdentifier("Session:" + sessionId + "//" + debugFsId.Name + ".LayerDefinition");
             var breader = source.GetReader();
             resSvc.SetResource(debugLayerId, breader, null);
-            
+
             _debugLayer = new MgdLayer(debugLayerId, resSvc);
             _debugLayer.SetLegendLabel("Debug Layer");
             _debugLayer.SetVisible(true);
@@ -222,7 +220,7 @@
             _defaultLineStringDigitizationPrompt = Properties.Resources.LineStringDigitizationPrompt;
             _defaultPolygonDigitizationPrompt = Properties.Resources.PolygonDigitizationPrompt;
             _defaultRectangleDigitizationPrompt = Properties.Resources.RectangleDigitizationPrompt;
-            
+
             renderWorker = new BackgroundWorker();
 
             renderWorker.DoWork += renderWorker_DoWork;
@@ -276,19 +274,18 @@
             }
         }
 
-        void OnMouseEnter(object sender, EventArgs e)
+        private void OnMouseEnter(object sender, EventArgs e)
         {
-            this.Focus();   
+            this.Focus();
         }
 
-        void OnMapMouseHover(object sender, EventArgs e)
+        private void OnMapMouseHover(object sender, EventArgs e)
         {
             HandleMouseHover(e);
         }
 
         private void HandleMouseHover(EventArgs e)
         {
-            
         }
 
         /// <summary>
@@ -306,7 +303,7 @@
                 base.MouseDoubleClick -= OnMapMouseDoubleClick;
                 base.MouseHover -= OnMapMouseHover;
                 base.MouseEnter -= OnMouseEnter;
-                base.MouseLeave -= OnMapMouseLeave; 
+                base.MouseLeave -= OnMapMouseLeave;
 
                 if (renderWorker != null)
                 {
@@ -338,12 +335,12 @@
         [Description("The amount of time (in ms) to wait to re-render after a mouse wheel scroll")]
         public int MouseWheelDelayRenderInterval { get; set; }
 
-        /// <summary> 
-        /// The amount of time (in ms) to wait to re-render after a mouse wheel scroll 
-        /// </summary> 
+        /// <summary>
+        /// The amount of time (in ms) to wait to re-render after a mouse wheel scroll
+        /// </summary>
         [Category("MapGuide Viewer")]
         [Description("The amount of time (in ms) to wait to fire off a tooltip request after the mouse pointer becomes stationary")]
-        public int TooltipDelayInterval { get; set; } 
+        public int TooltipDelayInterval { get; set; }
 
         private Color _selColor;
 
@@ -355,8 +352,8 @@
         public Color SelectionColor
         {
             get { return _selColor; }
-            set 
-            { 
+            set
+            {
                 _selColor = value;
                 OnPropertyChanged("SelectionColor");
             }
@@ -417,7 +414,6 @@
                     Trace.TraceInformation("Selection color updated to ({0}, {1}, {2})", value.R, value.G, value.B);
                 }
             }
-            
         }
 
         private bool _showVertexCoords;
@@ -490,7 +486,7 @@
                 e.Graphics.DrawImage(_selectionImage, new PointF(0, 0));
             }
 
-            //TODO: We could add support here for map-space persistent digitizations 
+            //TODO: We could add support here for map-space persistent digitizations
 
             if (isDragging && (this.ActiveTool == MapActiveTool.Select || this.ActiveTool == MapActiveTool.ZoomIn))
             {
@@ -514,9 +510,11 @@
                                 case MapDigitizationType.Circle:
                                     DrawTracingCircle(e);
                                     break;
+
                                 case MapDigitizationType.Line:
                                     DrawTracingLine(e);
                                     break;
+
                                 case MapDigitizationType.Rectangle:
                                     DrawTracingRectangle(e);
                                     break;
@@ -529,6 +527,7 @@
                                 case MapDigitizationType.LineString:
                                     DrawTracingLineString(e);
                                     break;
+
                                 case MapDigitizationType.Polygon:
                                     DrawTracingPolygon(e);
                                     break;
@@ -594,7 +593,7 @@
                 }
             }
         }
-        
+
         /// <summary>
         /// Gets or sets the amount of pixels to buffer out by when doing point-based selections with the select tool
         /// </summary>
@@ -668,12 +667,11 @@
                 return;
 
             var f = Control.DefaultFont;
-            
-            
+
             int height = 0;
             int width = 0;
-            string [] tokens = text.Split(new string[] {"\\n", "\\r\\n", "\n", Environment.NewLine }, StringSplitOptions.None);
-            foreach(string t in tokens)
+            string[] tokens = text.Split(new string[] { "\\n", "\\r\\n", "\n", Environment.NewLine }, StringSplitOptions.None);
+            foreach (string t in tokens)
             {
                 var size = e.Graphics.MeasureString(t, f);
                 height += (int)size.Height;
@@ -700,7 +698,7 @@
             e.Graphics.DrawEllipse(CreateOutlinePen(), pt2.X, pt2.Y, diameter, diameter);
             e.Graphics.FillEllipse(CreateFillBrush(), pt2.X, pt2.Y, diameter, diameter);
 
-            string str = (_circleCustomDigitizationPrompt ?? _defaultCircleDigitizationPrompt) + Environment.NewLine + _defaultDigitizationInstructions; 
+            string str = (_circleCustomDigitizationPrompt ?? _defaultCircleDigitizationPrompt) + Environment.NewLine + _defaultDigitizationInstructions;
             DrawTrackingTooltip(e, str);
         }
 
@@ -709,7 +707,7 @@
             e.Graphics.DrawLine(CreateOutlinePen(), dPtStart, new Point(_mouseX, _mouseY));
             DrawVertexCoordinates(e, dPtStart.X, dPtStart.Y, true);
             DrawVertexCoordinates(e, _mouseX, _mouseY, true);
-            string str = (_lineCustomDigitizationPrompt ?? _defaultLineDigitizationPrompt) + Environment.NewLine + _defaultDigitizationInstructions; 
+            string str = (_lineCustomDigitizationPrompt ?? _defaultLineDigitizationPrompt) + Environment.NewLine + _defaultDigitizationInstructions;
             DrawTrackingTooltip(e, str);
         }
 
@@ -718,14 +716,14 @@
             //Not enough points to constitute a line string or polygon
             if (dPath.Count < 2)
                 return;
-            
+
             e.Graphics.DrawLines(CreateOutlinePen(), dPath.ToArray());
             foreach (var pt in dPath)
             {
                 DrawVertexCoordinates(e, pt.X, pt.Y, true);
             }
 
-            string str = (_lineStringCustomDigitizationPrompt ?? _defaultLineStringDigitizationPrompt) + Environment.NewLine + _defaultMultiSegmentDigitizationInstructions; 
+            string str = (_lineStringCustomDigitizationPrompt ?? _defaultLineStringDigitizationPrompt) + Environment.NewLine + _defaultMultiSegmentDigitizationInstructions;
             DrawTrackingTooltip(e, str);
         }
 
@@ -741,7 +739,7 @@
             {
                 DrawVertexCoordinates(e, pt.X, pt.Y, true);
             }
-            string str = (_polygonCustomDigitizationPrompt ?? _defaultPolygonDigitizationPrompt) + Environment.NewLine + _defaultMultiSegmentDigitizationInstructions; 
+            string str = (_polygonCustomDigitizationPrompt ?? _defaultPolygonDigitizationPrompt) + Environment.NewLine + _defaultMultiSegmentDigitizationInstructions;
             DrawTrackingTooltip(e, str);
         }
 
@@ -760,7 +758,7 @@
                 DrawVertexCoordinates(e, r.Left, r.Bottom, true);
                 DrawVertexCoordinates(e, r.Right, r.Top, true);
                 DrawVertexCoordinates(e, r.Right, r.Bottom, true);
-                string str = (_rectangleCustomDigitizationPrompt ?? _defaultRectangleDigitizationPrompt) + Environment.NewLine + _defaultDigitizationInstructions; 
+                string str = (_rectangleCustomDigitizationPrompt ?? _defaultRectangleDigitizationPrompt) + Environment.NewLine + _defaultDigitizationInstructions;
                 DrawTrackingTooltip(e, str);
             }
         }
@@ -819,34 +817,34 @@
 
         /*
          * Digitization behaviour with respect to mouse and paint events
-         * 
+         *
          * Point:
          *  MouseClick -> Invoke Callback
-         * 
+         *
          * Rectangle:
          *  MouseClick -> set start, temp end
          *  MouseMove -> update temp end
          *  OnPaint -> Draw rectangle from start/temp end
          *  MouseClick -> set end -> Invoke Callback
-         * 
+         *
          * Line:
          *  MouseClick -> set start, temp end
          *  MouseMove -> update temp end
          *  OnPaint -> Draw line from start/temp end
          *  MouseClick -> set end -> Invoke Callback
-         * 
+         *
          * LineString:
          *  MouseClick -> append point to path
          *  MouseMove -> update temp end
          *  OnPaint -> Draw line with points in path + temp end
          *  MouseDoubleClick -> append point to path -> Invoke Callback
-         * 
+         *
          * Polygon:
          *  MouseClick -> append point to path
          *  MouseMove -> update temp end
          *  OnPaint -> Draw polygon fill with points in path + temp end
          *  MouseDoubleClick -> append point to path -> Invoke Callback
-         * 
+         *
          * Circle:
          *  MouseClick -> set start, temp end
          *  MouseMove -> update temp end
@@ -1118,14 +1116,14 @@
             cb(mapPt.X, mapPt.Y);
         }
 
-        #endregion
+        #endregion Digitization
 
-        static ViewerRenderingOptions CreateMapRenderingOptions(short red, short green, short blue)
+        private static ViewerRenderingOptions CreateMapRenderingOptions(short red, short green, short blue)
         {
             return new ViewerRenderingOptions("PNG", 2, Color.FromArgb(red, green, blue));
         }
 
-        static ViewerRenderingOptions CreateSelectionRenderingOptions(short red, short green, short blue)
+        private static ViewerRenderingOptions CreateSelectionRenderingOptions(short red, short green, short blue)
         {
             return new ViewerRenderingOptions("PNG", (1 | 4), Color.FromArgb(red, green, blue));
         }
@@ -1247,7 +1245,7 @@
         /// <summary>
         /// Gets whether to use the RenderMap API instead of RenderDynamicOverlay if the map has tiled
         /// layers. RenderMap includes tiled layers as part of the output image, but will not take advantage
-        /// of any tile caching mechanisms. Setting this property to true nullifies any effect of the 
+        /// of any tile caching mechanisms. Setting this property to true nullifies any effect of the
         /// <see cref="P:Maestro.MapViewer.MapViewer.ConvertTiledGroupsToNonTiled"/> property
         /// </summary>
         [Category("MapGuide Viewer")] //NOXLATE
@@ -1274,7 +1272,7 @@
 
         private System.Timers.Timer _delayedResizeTimer;
 
-        void OnDelayResizeTimerElapsed(object sender, System.Timers.ElapsedEventArgs e)
+        private void OnDelayResizeTimerElapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
             var action = new MethodInvoker(() =>
             {
@@ -1295,7 +1293,7 @@
                 action();
         }
 
-        void OnControlResized(object sender, EventArgs e)
+        private void OnControlResized(object sender, EventArgs e)
         {
             if (_delayedResizeTimer == null)
             {
@@ -1392,9 +1390,12 @@
             }
         }
 
-        class RenderWorkArgs
+        private class RenderWorkArgs
         {
-            public RenderWorkArgs() { this.UseRenderMap = false; }
+            public RenderWorkArgs()
+            {
+                this.UseRenderMap = false;
+            }
 
             public bool UseRenderMap { get; set; }
 
@@ -1407,7 +1408,7 @@
             public bool InvalidateRegardless { get; set; }
         }
 
-        class RenderResult
+        private class RenderResult
         {
             public Image Image { get; set; }
 
@@ -1459,7 +1460,7 @@
         internal void RenderSelection(bool invalidateRegardless)
         {
             //This is our refresh action
-            RefreshAction action = new RefreshAction(() => 
+            RefreshAction action = new RefreshAction(() =>
             {
                 if (HasSelection())
                 {
@@ -1479,7 +1480,7 @@
                 }
             });
 
-            //If an existing rendering operation is in progress queue it if 
+            //If an existing rendering operation is in progress queue it if
             //there isn't one queued. Because there is no point in doing the
             //same thing more than once
             if (this.IsBusy)
@@ -1493,9 +1494,9 @@
             }
         }
 
-        delegate void RefreshAction();
+        private delegate void RefreshAction();
 
-        RefreshAction _queuedRefresh = null;
+        private RefreshAction _queuedRefresh = null;
 
         internal void RefreshMap(bool raiseEvents)
         {
@@ -1504,7 +1505,7 @@
                 h(this, EventArgs.Empty);
 
             //This is our refresh action
-            RefreshAction action = new RefreshAction(() => 
+            RefreshAction action = new RefreshAction(() =>
             {
                 var args = new RenderWorkArgs()
                 {
@@ -1521,7 +1522,7 @@
                 renderWorker.RunWorkerAsync(args);
             });
 
-            //If an existing rendering operation is in progress queue it if 
+            //If an existing rendering operation is in progress queue it if
             //there isn't one queued. Because there is no point in doing the
             //same thing more than once
             if (this.IsBusy)
@@ -1531,13 +1532,13 @@
             }
             else //Otherwise execute it immediately
             {
-                action();   
+                action();
             }
         }
 
         /// <summary>
         /// Raised when the viewer has started refreshing the map. This is to allow
-        /// any actions dependent on map state to update themselves asynchronously 
+        /// any actions dependent on map state to update themselves asynchronously
         /// without needing to wait for the updated map to be rendered.
         /// </summary>
         [Category("MapGuide Viewer")]
@@ -1688,7 +1689,7 @@
             _extX2 = coord.X + mcsWidth / 2;
             _extY2 = coord.Y - mcsHeight / 2;
         }
-        
+
         /// <summary>
         /// Gets the current view extent
         /// </summary>
@@ -1936,7 +1937,7 @@
                     _queuedRefresh();
                     _queuedRefresh = null;
                 }
-                else 
+                else
                 {
                     if (bInvalidate || res.InvalidateRegardless)
                         Invalidate(true);
@@ -2231,9 +2232,9 @@
 
         private void OnMapMouseLeave(object sender, EventArgs e)
         {
-            //Need to do this otherwise a tooltip query is made at the viewer boundary 
- 		    if (delayTooltipTimer != null && delayTooltipTimer.Enabled) 
- 		        delayTooltipTimer.Stop(); 
+            //Need to do this otherwise a tooltip query is made at the viewer boundary
+            if (delayTooltipTimer != null && delayTooltipTimer.Enabled)
+                delayTooltipTimer.Stop();
         }
 
         private void OnMapMouseDown(object sender, MouseEventArgs e)
@@ -2247,7 +2248,7 @@
             if (IsBusy) return;
             HandleMouseMove(e);
         }
-        
+
         private void OnMapMouseUp(object sender, MouseEventArgs e)
         {
             if (IsBusy) return;
@@ -2378,12 +2379,12 @@
             Trace.TraceInformation("Paint transform (tx: " + mouseWheelTx + ", ty: " + mouseWheelTy + ", sx: " + mouseWheelSx + ", sy: " + mouseWheelSy + ")");
         }
 
-        static double GetMetersPerPixel(int dpi)
+        private static double GetMetersPerPixel(int dpi)
         {
             return 0.0254 / dpi;
         }
 
-        double GetNewScale(double currentScale, int wheelZoomDelta)
+        private double GetNewScale(double currentScale, int wheelZoomDelta)
         {
             var newScale = currentScale;
             /*
@@ -2411,7 +2412,7 @@
             return newScale;
         }
 
-        double NormalizeScale(double scale)
+        private double NormalizeScale(double scale)
         {
             if (scale < this.MinScale)
                 return this.MinScale;
@@ -2420,7 +2421,7 @@
             return scale;
         }
 
-        void OnDelayRender(object sender, System.Timers.ElapsedEventArgs e)
+        private void OnDelayRender(object sender, System.Timers.ElapsedEventArgs e)
         {
             Trace.TraceInformation("Delay rendering");
             Trace.TraceInformation("Set new map coordinates to (" + delayRenderViewCenter.Value.X + ", " + delayRenderViewCenter.Value.Y + " at " + delayRenderScale.Value + ")");
@@ -2498,6 +2499,7 @@
                                         OnCircleDigitized(dPtStart, dPtEnd);
                                     }
                                     break;
+
                                 case MapDigitizationType.Line:
                                     {
                                         dPtEnd.X = e.X;
@@ -2505,6 +2507,7 @@
                                         OnLineDigitized(dPtStart, dPtEnd);
                                     }
                                     break;
+
                                 case MapDigitizationType.Rectangle:
                                     {
                                         dPtEnd.X = e.X;
@@ -2567,9 +2570,11 @@
                     case MapActiveTool.Pan:
                         Trace.TraceInformation("START PANNING");
                         break;
+
                     case MapActiveTool.Select:
                         Trace.TraceInformation("START SELECT");
                         break;
+
                     case MapActiveTool.ZoomIn:
                         Trace.TraceInformation("START ZOOM");
                         break;
@@ -2580,11 +2585,11 @@
         private System.Drawing.Point translate;
 
         private System.Drawing.Point dragStart;
-        bool isDragging = false;
-        
+        private bool isDragging = false;
+
         private int _mouseX;
         private int _mouseY;
-        
+
         private string _activeTooltipText;
 
         private int _mouseDx;
@@ -2594,7 +2599,7 @@
         /// A mouse is considered to have moved if the differerence in either X or Y directions is greater
         /// than this number
         /// </summary>
-        const int MOUSE_TOOLTIP_MOVE_TOLERANCE = 10;
+        private const int MOUSE_TOOLTIP_MOVE_TOLERANCE = 10;
 
         private void HandleMouseMove(MouseEventArgs e)
         {
@@ -2629,13 +2634,13 @@
                     }
                 }
 
-                // FIXME: 
+                // FIXME:
                 //
                 // We really need a JS setTimeout() equivalent for C# because that's what we want
                 // to do here, set a delayed call to QueryFirstVisibleTooltip() that is aborted if
                 // the mouse pointer has moved significantly since the last time.
                 //
-                // A timer based approach could probably work, but I haven't figured out the best 
+                // A timer based approach could probably work, but I haven't figured out the best
                 // way yet.
 
                 this.TooltipsEnabled = !isDragging && this.FeatureTooltipsEnabled;
@@ -2645,22 +2650,22 @@
                    (this.ActiveTool == MapActiveTool.Select || this.ActiveTool == MapActiveTool.Pan) &&
                     this.TooltipsEnabled)
                 {
-                    if (delayTooltipTimer == null) 
- 		            { 
- 		                delayTooltipTimer = new System.Timers.Timer(); 
- 		                delayTooltipTimer.Enabled = false; 
- 		                delayTooltipTimer.Elapsed += new System.Timers.ElapsedEventHandler(OnDelayTooltipTimerElapsed); 
- 		                delayTooltipTimer.Interval = this.TooltipDelayInterval; 
- 		            } 
- 		 
- 		            _delayTooltipQueryPoint = new Point(e.X, e.Y); 
- 		            delayTooltipTimer.Start(); 
- 		 
- 		            if (Math.Abs(e.X - _lastTooltipQueryX) > 2 || Math.Abs(e.Y - _lastTooltipQueryY) > 2) 
- 		            { 
- 		                _activeTooltipText = null; 
- 		                Invalidate(); 
- 		            } 
+                    if (delayTooltipTimer == null)
+                    {
+                        delayTooltipTimer = new System.Timers.Timer();
+                        delayTooltipTimer.Enabled = false;
+                        delayTooltipTimer.Elapsed += new System.Timers.ElapsedEventHandler(OnDelayTooltipTimerElapsed);
+                        delayTooltipTimer.Interval = this.TooltipDelayInterval;
+                    }
+
+                    _delayTooltipQueryPoint = new Point(e.X, e.Y);
+                    delayTooltipTimer.Start();
+
+                    if (Math.Abs(e.X - _lastTooltipQueryX) > 2 || Math.Abs(e.Y - _lastTooltipQueryY) > 2)
+                    {
+                        _activeTooltipText = null;
+                        Invalidate();
+                    }
                 }
                 else
                 {
@@ -2683,24 +2688,24 @@
             }
         }
 
-        void OnDelayTooltipTimerElapsed(object sender, System.Timers.ElapsedEventArgs e) 
- 		{ 
- 		    delayTooltipTimer.Stop(); 
- 		    if (_delayTooltipQueryPoint.HasValue) 
- 		    { 
- 		        _activeTooltipText = QueryFirstVisibleTooltip(_delayTooltipQueryPoint.Value.X, _delayTooltipQueryPoint.Value.Y); 
- 		        _lastTooltipQueryX = _delayTooltipQueryPoint.Value.X; 
- 		        _lastTooltipQueryY = _delayTooltipQueryPoint.Value.Y; 
- 		        _delayTooltipQueryPoint = null; 
- 		        Invalidate(); 
- 		    } 
- 		} 
- 		 
- 		private int _lastTooltipQueryX; 
- 		private int _lastTooltipQueryY; 
- 		private Point? _delayTooltipQueryPoint = null; 
- 		private System.Timers.Timer delayTooltipTimer = null; 
+        private void OnDelayTooltipTimerElapsed(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            delayTooltipTimer.Stop();
+            if (_delayTooltipQueryPoint.HasValue)
+            {
+                _activeTooltipText = QueryFirstVisibleTooltip(_delayTooltipQueryPoint.Value.X, _delayTooltipQueryPoint.Value.Y);
+                _lastTooltipQueryX = _delayTooltipQueryPoint.Value.X;
+                _lastTooltipQueryY = _delayTooltipQueryPoint.Value.Y;
+                _delayTooltipQueryPoint = null;
+                Invalidate();
+            }
+        }
 
+        private int _lastTooltipQueryX;
+        private int _lastTooltipQueryY;
+        private Point? _delayTooltipQueryPoint = null;
+        private System.Timers.Timer delayTooltipTimer = null;
+
         private void HandleMouseUp(MouseEventArgs e)
         {
             if (isDragging)
@@ -2779,7 +2784,7 @@
         [Description("Raised when the map position as indicated by the current mouse pointer has changed")]
         public event EventHandler<MapPointEventArgs> MouseMapPositionChanged;
 
-        #endregion
+        #endregion Mouse handlers
 
         private MapActiveTool _tool;
 
@@ -2808,18 +2813,21 @@
                             this.Cursor = new Cursor(ms);
                         }
                         break;
+
                     case MapActiveTool.ZoomIn:
                         using (var ms = new MemoryStream(Properties.Resources.zoomin))
                         {
                             this.Cursor = new Cursor(ms);
                         }
                         break;
+
                     case MapActiveTool.ZoomOut:
                         using (var ms = new MemoryStream(Properties.Resources.zoomout))
                         {
                             this.Cursor = new Cursor(ms);
                         }
                         break;
+
                     case MapActiveTool.None:
                     case MapActiveTool.Select:
                         {
@@ -2930,4 +2938,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.MapViewer/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.MapViewer/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.MapViewer/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Maestro.MapViewer")]
@@ -11,10 +10,10 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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("a8ce632c-f122-43b9-b9f3-d00520adcb89")]
+[assembly: Guid("a8ce632c-f122-43b9-b9f3-d00520adcb89")]
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Packaging/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Packaging/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace Maestro.Packaging
@@ -29,7 +29,7 @@
     /// MapGuide Packages
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Packaging/PackageBuilder.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/PackageBuilder.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Packaging/PackageBuilder.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,35 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
+using ICSharpCode.SharpZipLib.Zip;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels.Common;
 using System;
-using System.Linq;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using ICSharpCode.SharpZipLib.Zip;
-using System.Xml;
 using System.Collections.Specialized;
 using System.IO;
+using System.Linq;
+using System.Xml;
 
 namespace Maestro.Packaging
 {
@@ -41,34 +42,42 @@
         /// The file list is being fetched from MapGuide
         /// </summary>
         ReadingFileList,
+
         /// <summary>
         /// Files are downloaded in temporary folder
         /// </summary>
         PreparingFolder,
+
         /// <summary>
         /// Resource references are updated to use the new folder
         /// </summary>
         MovingResources,
+
         /// <summary>
         /// The files are being compressed
         /// </summary>
         Compressing,
+
         /// <summary>
         /// The package opertion has completed
         /// </summary>
         Done,
+
         /// <summary>
         /// The package is being uploaded
         /// </summary>
         Uploading,
+
         /// <summary>
         /// Extracting filenames from package
         /// </summary>
         ListingFiles,
+
         /// <summary>
         /// Setting resource content
         /// </summary>
         SetResource,
+
         /// <summary>
         /// Setting resource data
         /// </summary>
@@ -84,10 +93,12 @@
         /// The item already exists in the package
         /// </summary>
         Regular,
+
         /// <summary>
         /// The item is deleted from the package
         /// </summary>
         Deleted,
+
         /// <summary>
         /// The item is added to the package
         /// </summary>
@@ -142,7 +153,7 @@
         {
             if (Progress != null)
                 Progress(ProgressType.Uploading, sourceFile, 100, 0);
-            
+
             m_lastPg = -1;
             m_connection.ResourceService.UploadPackage(sourceFile, new Utility.StreamCopyProgressDelegate(ProgressCallback_Upload));
 
@@ -151,7 +162,7 @@
         }
 
         /// <summary>
-        /// Uploads a package to the server in a non-transactional fashion. Resources which fail to load are added to the specified list of 
+        /// Uploads a package to the server in a non-transactional fashion. Resources which fail to load are added to the specified list of
         /// failed resources. The upload is non-transactional in the sense that it can partially fail. Failed operations are logged.
         /// </summary>
         /// <param name="sourceFile">The source package file</param>
@@ -173,12 +184,12 @@
 
             double step = 0.0;
             progress(ProgressType.ListingFiles, sourceFile, 100, step);
-            
+
             //Process overview:
             //
             // 1. Extract the package to a temp directory
             // 2. Read the package manifest
-            // 3. For each resource id in the manifest, if it is in the list of resource ids to skip 
+            // 3. For each resource id in the manifest, if it is in the list of resource ids to skip
             //    then skip it. Otherwise process the directive that uses this id.
 
             ZipFile package = new ZipFile(sourceFile);
@@ -257,6 +268,7 @@
                             }
                         }
                         break;
+
                     case "SETRESOURCEDATA": //NOXLATE
                         {
                             SetResourceDataPackageOperation sop = (SetResourceDataPackageOperation)op;
@@ -311,6 +323,7 @@
                         op = new SetResourcePackageOperation(resourceId, p["CONTENT"], p["HEADER"]); //NOXLATE
                     }
                     break;
+
                 case "SETRESOURCEDATA": //NOXLATE
                     {
                         ResourceDataType rdt;
@@ -472,7 +485,6 @@
 
                 foreach (var folder in folders)
                 {
-
                     if (Progress != null)
                         Progress(ProgressType.PreparingFolder, folder, files.Count + folders.Count + 1, opno);
                     AddFolderResource(manifest, temppath, folder, removeExistingFiles, m_connection, filemap);
@@ -537,7 +549,6 @@
                 using (System.IO.FileStream fs = new System.IO.FileStream(filemap[filemap.Count - 1].Value, System.IO.FileMode.CreateNew, System.IO.FileAccess.Write, System.IO.FileShare.None))
                     m_connection.ResourceService.SerializeObject(manifest, fs);
 
-
                 if (Progress != null)
                     Progress(ProgressType.MovingResources, zipfilename, filemap.Count, 0);
 
@@ -548,7 +559,6 @@
                     Progress(ProgressType.MovingResources, zipfilename, filemap.Count, filemap.Count);
                     Progress(ProgressType.Done, "", filemap.Count, filemap.Count);
                 }
-
             }
             finally
             {
@@ -688,7 +698,6 @@
             AddFolderResource(manifest, folderResId, headerpath, eraseFirst);
         }
 
-
         private void AddFolderResource(ResourcePackageManifest manifest, string resourceId, string headerpath, bool eraseFirst)
         {
             if (eraseFirst)
@@ -861,7 +870,6 @@
             }
         }
 
-
         private const string DEFAULT_HEADER =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
             "<ResourceFolderHeader xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"ResourceFolderHeader-1.0.0.xsd\">\n" +
@@ -870,7 +878,6 @@
             "	</Security>\n" +
             "</ResourceFolderHeader>"; //NOXLATE
 
-
         private string MapResourcePathToFolder(string tempfolder, string resourcename)
         {
             return CreateFolderForResource(resourcename, tempfolder);
@@ -981,7 +988,6 @@
                                 using (System.IO.FileStream fs = new System.IO.FileStream(filemap[filemap.Count - 1].Value, System.IO.FileMode.CreateNew, System.IO.FileAccess.Write, System.IO.FileShare.None))
                                     Utility.CopyStream(zipfile.GetInputStream(index), fs);
                             }
-
                         }
 
                         ri.Headerpath = headerpath;
@@ -994,7 +1000,7 @@
                             {
                                 var tempFilePath = System.IO.Path.Combine(tempfolder, ri.GenerateUniqueName());
                                 filemap.Add(new KeyValuePair<string, string>(targetpath, tempFilePath));
-                                if (File.Exists(rdi.Filename)) 
+                                if (File.Exists(rdi.Filename))
                                     File.Copy(rdi.Filename, tempFilePath);
                             }
                             else
@@ -1216,7 +1222,10 @@
         /// Initializes a new instance of the <see cref="PackageOperation"/> class.
         /// </summary>
         /// <param name="resId">The res id.</param>
-        protected PackageOperation(string resId) { this.ResourceId = resId; }
+        protected PackageOperation(string resId)
+        {
+            this.ResourceId = resId;
+        }
     }
 
     /// <summary>
@@ -1283,7 +1292,7 @@
         /// Returns a hash code for this instance.
         /// </summary>
         /// <returns>
-        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
+        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
         /// </returns>
         public override int GetHashCode()
         {
@@ -1377,7 +1386,7 @@
         /// Returns a hash code for this instance.
         /// </summary>
         /// <returns>
-        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
+        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
         /// </returns>
         public override int GetHashCode()
         {
@@ -1395,4 +1404,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Packaging/PackageProgress.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/PackageProgress.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Packaging/PackageProgress.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Shared.UI;
 
 namespace Maestro.Packaging
 {
@@ -41,7 +41,7 @@
 
         static PackageProgress()
         {
-            BUILD_STAGES = 
+            BUILD_STAGES =
             new ProgressType[] {
                 ProgressType.ReadingFileList,
                 ProgressType.PreparingFolder,
@@ -98,7 +98,7 @@
 
         /// <summary>
         /// Initiates a user-controlled upload loop whereby failed operations from a non-transactional
-        /// package upload can be retried as many times until either all failed operations have been 
+        /// package upload can be retried as many times until either all failed operations have been
         /// accounted for, or the user has decided to stop
         /// </summary>
         /// <param name="owner"></param>
@@ -231,7 +231,7 @@
         public static DialogResult CreatePackage(Form owner, IServerConnection connection, string folderResourceId, string zipfilename, IEnumerable<ResourceTypes> allowedExtensions, bool removeExistingFiles, string alternateTargetResourceId)
         {
             PackageProgress pkgp = new PackageProgress();
-            
+
             var builder = new PackageBuilder(connection);
             pkgp.m_invokeObj = builder;
             pkgp.m_method = () => { builder.CreatePackage(folderResourceId, zipfilename, allowedExtensions, removeExistingFiles, alternateTargetResourceId); return true; };
@@ -253,7 +253,7 @@
         public static DialogResult CreatePackage(Form owner, IServerConnection connection, string[] resourceIdList, string zipfilename, IEnumerable<ResourceTypes> allowedExtensions, bool removeExistingFiles, string alternateTargetResourceId)
         {
             PackageProgress pkgp = new PackageProgress();
-            
+
             var builder = new PackageBuilder(connection);
             pkgp.m_invokeObj = builder;
             pkgp.m_method = () => { builder.CreatePackage(resourceIdList, zipfilename, allowedExtensions, removeExistingFiles, alternateTargetResourceId); return true; };
@@ -288,6 +288,7 @@
         }
 
         private delegate void SetCurrentProgressDelegate(ProgressType type, string resource, int total, double pg);
+
         private void SetCurrentProgress(ProgressType type, string resource, int total, double pg)
         {
             if (this.InvokeRequired)
@@ -310,7 +311,7 @@
 
                     this.TotalProgress.Value = (int)Math.Max(Math.Min((int)lv, this.TotalProgress.Maximum), this.TotalProgress.Minimum);
                 }
-                
+
                 if (type == ProgressType.Uploading)
                 {
                     HideTotal();

Modified: trunk/Tools/Maestro/Maestro.Packaging/PackageUploadOptionDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/PackageUploadOptionDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Packaging/PackageUploadOptionDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Packaging
@@ -37,6 +35,7 @@
         /// have issues with certain packages due to size and encrypted content.
         /// </summary>
         Transactional,
+
         /// <summary>
         /// This method can partially succeed and/or partially fail. Failed operations are logged. This method
         /// can have its progress measured and is generally unaffected by size and encryption issues. This method
@@ -79,4 +78,4 @@
             this.DialogResult = DialogResult.OK;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Packaging/PackageUploadResultDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/PackageUploadResultDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Packaging/PackageUploadResultDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Packaging
@@ -67,4 +65,4 @@
             this.DialogResult = DialogResult.Retry;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Packaging/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Packaging/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Maestro.Packaging")]
@@ -11,10 +10,10 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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("898031bf-637e-4c1b-a87a-3d0e5403cb2c")]
+[assembly: Guid("898031bf-637e-4c1b-a87a-3d0e5403cb2c")]
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Packaging/ResourceDataItem.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/ResourceDataItem.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Packaging/ResourceDataItem.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace Maestro.Packaging
 {
     /// <summary>
@@ -113,4 +112,4 @@
             set { m_dataType = value; }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Packaging/ResourceItem.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/ResourceItem.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Packaging/ResourceItem.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace Maestro.Packaging
 {
@@ -28,7 +30,6 @@
     /// </summary>
     public class ResourceItem
     {
-
         /// <summary>
         /// Initializes a new instance of the <see cref="ResourceItem"/> class.
         /// </summary>
@@ -100,7 +101,6 @@
             set { m_entryType = value; }
         }
 
-
         /// <summary>
         /// Gets or sets the original resource path.
         /// </summary>
@@ -146,4 +146,4 @@
             return this.ResourcePath.Replace("://", "_").Replace("/", "_").Replace(".", "_") + Guid.NewGuid().ToString(); //NOXLATE
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Packaging/UploadPackageResult.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/UploadPackageResult.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Packaging/UploadPackageResult.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace Maestro.Packaging
 {
@@ -46,7 +48,10 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="UploadPackageResult"/> class.
         /// </summary>
-        public UploadPackageResult() : this(new PackageOperation[0]) { }
+        public UploadPackageResult()
+            : this(new PackageOperation[0])
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="UploadPackageResult"/> class.
@@ -59,4 +64,4 @@
             this.SkipOperations = new List<PackageOperation>(skip);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Packaging/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/packages.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Packaging/packages.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SharpZipLib" version="0.86.0" targetFramework="net40-Client" />
+    <package id="SharpZipLib" version="0.86.0" targetFramework="net40-Client" />
 </packages>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/BusyWaitDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/BusyWaitDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/BusyWaitDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,24 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Drawing;
 using System.Globalization;
 using System.Threading;
 using System.Windows.Forms;
@@ -26,11 +28,11 @@
 namespace Maestro.Shared.UI
 {
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <returns></returns>
     public delegate object BusyWaitDelegate();
-    
+
     /// <summary>
     /// A generic dialog for some potentially long task that cannot be measured
     /// </summary>
@@ -38,7 +40,7 @@
     {
         private BusyWaitDelegate _action;
         private CultureInfo _culture;
-        
+
         internal BusyWaitDialog(BusyWaitDelegate action, CultureInfo culture)
         {
             //
@@ -48,7 +50,7 @@
             _action = action;
             _culture = culture;
         }
-        
+
         /// <summary>
         /// Raises the System.Windows.Forms.Form.Load event.
         /// </summary>
@@ -58,7 +60,7 @@
             base.OnLoad(e);
             bgWorker.RunWorkerAsync();
         }
-        
+
         /// <summary>
         /// Gets the return value of the completed background worker (if any)
         /// </summary>
@@ -93,7 +95,7 @@
                 throw new ArgumentNullException("action"); //NOXLATE
             if (onComplete == null)
                 throw new ArgumentNullException("onComplete"); //NOXLATE
-            
+
             var frm = new BusyWaitDialog(action, bPreserveThreadCulture ? Thread.CurrentThread.CurrentCulture : null);
             frm.lblBusy.Text = message;
             if (frm.ShowDialog() == DialogResult.OK)
@@ -101,8 +103,8 @@
                 onComplete.Invoke(frm.ReturnValue, frm.Error);
             }
         }
-        
-        void BgWorker_DoWork(object sender, System.ComponentModel.DoWorkEventArgs e)
+
+        private void BgWorker_DoWork(object sender, System.ComponentModel.DoWorkEventArgs e)
         {
             if (_culture != null)
             {
@@ -112,8 +114,8 @@
             }
             e.Result = _action.Invoke();
         }
-        
-        void BgWorker_RunWorkerCompleted(object sender, System.ComponentModel.RunWorkerCompletedEventArgs e)
+
+        private void BgWorker_RunWorkerCompleted(object sender, System.ComponentModel.RunWorkerCompletedEventArgs e)
         {
             if (e.Error != null)
             {
@@ -123,8 +125,8 @@
             {
                 this.ReturnValue = e.Result;
             }
-            
+
             this.DialogResult = DialogResult.OK;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/CancelException.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/CancelException.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/CancelException.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Maestro.Shared.UI
 {
@@ -39,18 +40,29 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="CancelException"/> class.
         /// </summary>
-        public CancelException() { }
+        public CancelException()
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="CancelException"/> class.
         /// </summary>
         /// <param name="message">The message.</param>
-        public CancelException(string message) : base(message) { }
+        public CancelException(string message)
+            : base(message)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="CancelException"/> class.
         /// </summary>
         /// <param name="message">The message.</param>
         /// <param name="inner">The inner.</param>
-        public CancelException(string message, Exception inner) : base(message, inner) { }
+        public CancelException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="CancelException"/> class.
         /// </summary>
@@ -67,4 +79,4 @@
           System.Runtime.Serialization.StreamingContext context)
             : base(info, context) { }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/CheckBoxBinder.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/CheckBoxBinder.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/CheckBoxBinder.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Windows.Forms;
 
 namespace Maestro.Shared.UI
 {
     /// <summary>
-    /// Helper class to bind object properties to <see cref="CheckBox"/> derived classes for 
+    /// Helper class to bind object properties to <see cref="CheckBox"/> derived classes for
     /// immediate updates as opposed to updates on loss of focus.
     /// </summary>
     public static class CheckBoxBinder
@@ -63,4 +63,4 @@
             return binding;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/CollapsiblePanel.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/CollapsiblePanel.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/CollapsiblePanel.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,42 +1,42 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
-using System.Data;
-using System.Text;
+using System.Drawing.Design;
 using System.Windows.Forms;
-using System.Drawing.Design;
 
 namespace Maestro.Shared.UI
 {
     /// <summary>
     /// A simple collapsible panel with basic properties for configuring header color/font
-    /// and content color. 
-    /// 
+    /// and content color.
+    ///
     /// This control works best when Dock = Top and any content below is also Dock = Top and this
     /// control was built with these assumptions in place.
-    /// 
+    ///
     /// Note that there is no designer support for this control (ie. Drag and drop does not do what
-    /// you would hope it would do). The way to use this control is to derive from this class and add your custom 
+    /// you would hope it would do). The way to use this control is to derive from this class and add your custom
     /// content there. Also this class does not appear in the VS Toolbox, thus you must apply ToolboxItemAttribute(true)
     /// on your derived classes if you want to make the control available for design.
     /// </summary>
@@ -170,4 +170,4 @@
             this.Collapsed = false;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/ComboBoxBinder.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/ComboBoxBinder.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/ComboBoxBinder.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Windows.Forms;
 
 namespace Maestro.Shared.UI
 {
     /// <summary>
-    /// Helper class to bind object properties to <see cref="ComboBox"/> derived classes for 
+    /// Helper class to bind object properties to <see cref="ComboBox"/> derived classes for
     /// immediate updates as opposed to updates on loss of focus.
     /// </summary>
     public static class ComboBoxBinder
@@ -64,4 +64,4 @@
             return binding;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/DialogFactory.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/DialogFactory.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/DialogFactory.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,20 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.IO;
 using System.Windows.Forms;
-using System.IO;
 
 namespace Maestro.Shared.UI
 {
     /// <summary>
     /// Helper class to overcome some of the bad default values assigned to the <see cref="OpenFileDialog"/> and <see cref="SaveFileDialog"/>
-    /// 
+    ///
     /// It is preferable to use this class instead of creating the <see cref="OpenFileDialog"/> or <see cref="SaveFileDialog"/> yourself.
     /// </summary>
     public static class DialogFactory
     {
-        static string _lastOpenDir;
-        static string _lastSaveDir;
+        private static string _lastOpenDir;
+        private static string _lastSaveDir;
 
         /// <summary>
         /// Creates an <see cref="OpenFileDialog"/> with sensible default values
@@ -24,15 +21,15 @@
         {
             var dlg = new OpenFileDialog();
 
-            // I guess someone at MSFT must've went over the wrong side of the ballmer peak 
+            // I guess someone at MSFT must've went over the wrong side of the ballmer peak
             // because RestoreDirectory should not default to false. Defaulting to false
             // means that attempting to load files/assemblies using relative paths
             // will most likely fail because for some reason, using this dialog will
             // actually modify the current working directory!
             //
             // So we set this to true, but to preserve the existing behaviour, we store
-            // the directory of the selected file in a static variable on dialog close (OK), 
-            // and assign this dir to the InitialDirectory property on each dialog request, 
+            // the directory of the selected file in a static variable on dialog close (OK),
+            // and assign this dir to the InitialDirectory property on each dialog request,
             // effectively replicating the old behaviour (w/o the nasty side effects)
             //
             // Or maybe my usage scenario does not qualify as a common use case.
@@ -58,15 +55,15 @@
         {
             var dlg = new SaveFileDialog();
 
-            // I guess someone at MSFT must've went over the wrong side of the ballmer peak 
+            // I guess someone at MSFT must've went over the wrong side of the ballmer peak
             // because RestoreDirectory should not default to false. Defaulting to false
             // means that attempting to load files/assemblies using relative paths
             // will most likely fail because for some reason, using this dialog will
             // actually modify the current working directory!
             //
             // So we set this to true, but to preserve the existing behaviour, we store
-            // the directory of the selected file in a static variable on dialog close (OK), 
-            // and assign this dir to the InitialDirectory property on each dialog request, 
+            // the directory of the selected file in a static variable on dialog close (OK),
+            // and assign this dir to the InitialDirectory property on each dialog request,
             // effectively replicating the old behaviour (w/o the nasty side effects)
             //
             // Or maybe my usage scenario does not qualify as a common use case.
@@ -84,4 +81,4 @@
             return dlg;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/ErrorDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/ErrorDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/ErrorDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
 using System.IO;
 using System.Reflection;
+using System.Windows.Forms;
 
 namespace Maestro.Shared.UI
 {
@@ -73,7 +71,7 @@
             var diag = new ErrorDialog();
             diag.txtMessage.Text = message;
             diag.txtDetails.Text = detail;
-            diag.ShowDialog();    
+            diag.ShowDialog();
         }
 
         /// <summary>
@@ -85,4 +83,4 @@
             Show(ex.Message, ex.ToString());
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/ISubView.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/ISubView.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/ISubView.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Windows.Forms;
 
 namespace Maestro.Shared.UI
@@ -34,4 +34,4 @@
         /// </summary>
         Control ContentControl { get; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/IViewContent.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/IViewContent.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/IViewContent.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
+using System.ComponentModel;
 using System.Drawing;
-using System.ComponentModel;
 
 namespace Maestro.Shared.UI
 {
@@ -34,78 +35,95 @@
         /// The title of the view
         /// </summary>
         string Title { get; set; }
+
         /// <summary>
         /// The view's description, this is the ToolTip content
         /// </summary>
         string Description { get; set; }
+
         /// <summary>
         /// Raised when the description has changed
         /// </summary>
         event EventHandler DescriptionChanged;
+
         /// <summary>
         /// Fires when the title has been changed
         /// </summary>
         event EventHandler TitleChanged;
+
         /// <summary>
         /// Detrmines if this view can be closed by the user, note that this does not affect the <see cref="Close"/> method
         /// in any way. All view content can still be programmatically closed if they inherit from <see cref="ViewContentBase"/> and
         /// does not override the default implementation of <see cref="Close"/>
         /// </summary>
         bool AllowUserClose { get; }
+
         /// <summary>
         /// Makes this content active
         /// </summary>
         void Activate();
+
         /// <summary>
-        /// Hides this view content. Can only be called when 
+        /// Hides this view content. Can only be called when
         /// </summary>
         void Hide();
+
         /// <summary>
         /// Closes the view. This raises the <see cref="ViewContentClosing"/> event
         /// </summary>
         /// <returns></returns>
         void Close();
+
         /// <summary>
         /// Sets the parent form this view will reside in. INTERNAL USE ONLY
         /// </summary>
         /// <param name="form"></param>
         void SetParentForm(System.Windows.Forms.Form form);
+
         /// <summary>
         /// Fired when the view is activating
         /// </summary>
         event EventHandler ViewContentActivating;
+
         /// <summary>
         /// Fired when the view has been closed internally
         /// </summary>
         event CancelEventHandler ViewContentClosing;
+
         /// <summary>
         /// Fired when the view has been closed internally
         /// </summary>
         event EventHandler ViewContentClosed;
+
         /// <summary>
         /// Fired when the view is going to hide
         /// </summary>
         event EventHandler ViewContentHiding;
+
         /// <summary>
-        /// Fired when the view, which was hidden is now being shown 
+        /// Fired when the view, which was hidden is now being shown
         /// </summary>
         event EventHandler ViewContentShowing;
+
         /// <summary>
         /// Displays an exception message
         /// </summary>
         /// <param name="ex">The exception object</param>
         void ShowError(Exception ex);
+
         /// <summary>
         /// Displays an error message
         /// </summary>
         /// <param name="message">The message</param>
         void ShowError(string message);
+
         /// <summary>
         /// Displays an alert message
         /// </summary>
         /// <param name="title">The title of this message</param>
         /// <param name="message">The message</param>
         void ShowMessage(string title, string message);
+
         /// <summary>
         /// Make a request for confirmation
         /// </summary>
@@ -113,6 +131,7 @@
         /// <param name="message">The message</param>
         /// <returns>true if confirmed, false otherwise</returns>
         bool Confirm(string title, string message);
+
         /// <summary>
         /// Make a request for confirmation
         /// </summary>
@@ -121,25 +140,30 @@
         /// <param name="args">The template values</param>
         /// <returns>true if confirmed, false otherwise</returns>
         bool ConfirmFormatted(string title, string format, params string[] args);
+
         /// <summary>
         /// Indicates whether this view is attached to a workbench
         /// </summary>
         bool IsAttached { get; }
+
         /// <summary>
         /// Gets whether this view resides in a modal window. Only applies if the <see cref="DefaultRegion"/>
         /// is Floating
         /// </summary>
         bool IsModalWindow { get; }
+
         /// <summary>
         /// Gets whether this view is set exclusively to the document region. If true, this view will always
         /// be placed into the document region regardless of the regions specified in the <see cref="DefaultRegion"/>
         /// property
         /// </summary>
         bool IsExclusiveToDocumentRegion { get; }
+
         /// <summary>
         /// Indicates the default region this view content will be put in
         /// </summary>
         ViewRegion DefaultRegion { get; }
+
         /// <summary>
         /// Gets the icon for this view
         /// </summary>
@@ -147,7 +171,7 @@
     }
 
     /// <summary>
-    /// Defines the possible regions of the user interface a <see cref="IViewContent"/> can reside in 
+    /// Defines the possible regions of the user interface a <see cref="IViewContent"/> can reside in
     /// </summary>
     public enum ViewRegion
     {
@@ -155,25 +179,30 @@
         /// The view content will reside in a floating dialog
         /// </summary>
         Floating = 1,
+
         /// <summary>
         /// The view content will be docked to the left
         /// </summary>
         Left = 2,
+
         /// <summary>
         /// The view content will be docked to the right
         /// </summary>
         Right = 4,
+
         /// <summary>
         /// The view content will be docked to the top
         /// </summary>
         Top = 8,
+
         /// <summary>
         /// The view content will be docked to the bottom
         /// </summary>
         Bottom = 16,
+
         /// <summary>
         /// The view content will be docked to the center, (in a tabbed document interface)
         /// </summary>
         Document = 32
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/IViewContentManager.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/IViewContentManager.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/IViewContentManager.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,22 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 
 namespace Maestro.Shared.UI
@@ -100,4 +103,4 @@
         /// </summary>
         event EventHandler ViewHidden;
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/IWorkbenchInitializer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/IWorkbenchInitializer.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/IWorkbenchInitializer.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
+//
+
+#endregion Disclaimer / License
+
 using System.Collections.Generic;
-using System.Text;
 using System.Drawing;
 using System.Windows.Forms;
 
@@ -34,38 +35,44 @@
         /// Gets whether to start the workbench maximized
         /// </summary>
         bool StartMaximized { get; }
+
         /// <summary>
         /// Gets the main window icon
         /// </summary>
         /// <returns></returns>
         Icon GetIcon();
+
         /// <summary>
         /// Gets the main menu
         /// </summary>
         /// <param name="workbench"></param>
         /// <returns></returns>
         MenuStrip GetMainMenu(WorkbenchBase workbench);
+
         /// <summary>
         /// Gets the main toolstrip
         /// </summary>
         /// <param name="workbench"></param>
         /// <returns></returns>
         ToolStrip GetMainToolStrip(WorkbenchBase workbench);
+
         /// <summary>
         /// Updates the status of the menu items
         /// </summary>
         /// <param name="menu"></param>
         /// <param name="toolstrips"></param>
         void UpdateMenuItemStatus(MenuStrip menu, IEnumerable<ToolStrip> toolstrips);
+
         /// <summary>
         /// Gets the view content manager
         /// </summary>
         /// <returns></returns>
         IViewContentManager GetViewContentManager();
+
         /// <summary>
         /// Gets the close icon for documents
         /// </summary>
         /// <returns></returns>
         Image GetDocumentCloseIcon();
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/NumericBinder.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/NumericBinder.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/NumericBinder.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Windows.Forms;
 
 namespace Maestro.Shared.UI
 {
     /// <summary>
-    /// Helper class to bind object properties to <see cref="NumericUpDown"/> derived classes for 
+    /// Helper class to bind object properties to <see cref="NumericUpDown"/> derived classes for
     /// immediate updates as opposed to updates on loss of focus.
     /// </summary>
     public static class NumericBinder
@@ -63,4 +63,4 @@
             return binding;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/ProgressDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/ProgressDialog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/ProgressDialog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.Globalization;
-using System.Text;
 using System.Threading;
 using System.Windows.Forms;
 
@@ -35,7 +34,7 @@
     public partial class ProgressDialog : Form
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public delegate object DoBackgroundWork(BackgroundWorker worker, DoWorkEventArgs e, params object[] args);
 
@@ -58,7 +57,7 @@
         /// <summary>
         /// A value indicating if the cancel button attempts to abort the thread, rather than simply flag it for cancellation
         /// </summary>
-        public bool CancelAbortsThread 
+        public bool CancelAbortsThread
         {
             get { return m_cancelAborts; }
             set { m_cancelAborts = value; }

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Maestro.Shared.UI")]
@@ -11,8 +10,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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)]
 

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/ServiceBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/ServiceBase.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/ServiceBase.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace Maestro.Shared.UI
 {
     /// <summary>
@@ -31,16 +30,22 @@
         /// <summary>
         /// Initializes this service
         /// </summary>
-        public virtual void Initialize() { }
+        public virtual void Initialize()
+        {
+        }
 
         /// <summary>
         /// Load this service
         /// </summary>
-        public virtual void Load() { }
+        public virtual void Load()
+        {
+        }
 
         /// <summary>
         /// Instructs this service to save any data before the application shuts down
         /// </summary>
-        public virtual void Save() { }
+        public virtual void Save()
+        {
+        }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/SingletonViewContent.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/SingletonViewContent.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/SingletonViewContent.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
+//
 
+#endregion Disclaimer / License
+
 namespace Maestro.Shared.UI
 {
     /// <summary>
@@ -70,4 +65,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/TabFactory.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/TabFactory.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/TabFactory.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Shared.UI
@@ -27,6 +29,7 @@
     internal class HiddenTab
     {
         public TabControl Parent { get; set; }
+
         public TabPage Tab { get; set; }
     }
 
@@ -34,7 +37,7 @@
     /// Platform check helper class. Use this class to determine if this assembly is executing
     /// under the Mono Runtime environment.
     /// </summary>
-    static class Platform
+    internal static class Platform
     {
         static Platform()
         {
@@ -61,7 +64,7 @@
     // - Using the SelectedTab property of TabControl
     // - Using the SelectedIndex property of TabControl and fetching the relevant tab from its TabPages collection
     //
-    // Mono (2.4) has a buggy implementation of TabControl and will do crazy things if you use the SelectedTab property. 
+    // Mono (2.4) has a buggy implementation of TabControl and will do crazy things if you use the SelectedTab property.
     // So if you're ever hacking code that involves setting or getting a selected tab, NEVER USE THE SelectedTab PROPERTY!
 
     internal static class TabFactory
@@ -72,13 +75,13 @@
         {
             TabPage page = new TabPage();
             page.ImageKey = imgKey;
-            page.Text = content.Title; 
+            page.Text = content.Title;
             page.ToolTipText = content.Description;
             page.Tag = content;
 
-            content.TitleChanged += (sender, e) => 
+            content.TitleChanged += (sender, e) =>
             {
-                page.Text = content.Title; 
+                page.Text = content.Title;
             };
             content.DescriptionChanged += (sender, e) =>
             {
@@ -113,7 +116,6 @@
                 }
             };
 
-
             content.ViewContentClosed += (sender, e) =>
             {
                 //Remove itself from the tab control
@@ -179,4 +181,4 @@
             return page;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/TextBoxBinder.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/TextBoxBinder.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/TextBoxBinder.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Windows.Forms;
 
 namespace Maestro.Shared.UI
 {
     /// <summary>
-    /// Helper class to bind object properties to <see cref="TextBoxBase"/> derived classes for 
+    /// Helper class to bind object properties to <see cref="TextBoxBase"/> derived classes for
     /// immediate updates as opposed to updates on loss of focus.
     /// </summary>
     public static class TextBoxBinder
@@ -43,9 +43,9 @@
         public static Binding BindText(TextBoxBase txt, Binding b)
         {
             txt.DataBindings.Add(b);
-            txt.TextChanged += (sender, e) => 
-            { 
-                b.WriteValue(); 
+            txt.TextChanged += (sender, e) =>
+            {
+                b.WriteValue();
             };
 
             return b;
@@ -61,12 +61,12 @@
         public static Binding BindText(TextBoxBase txt, object dataSource, string dataMember)
         {
             var binding = txt.DataBindings.Add("Text", dataSource, dataMember); //NOXLATE
-            txt.TextChanged += (sender, e) => 
-            { 
-                binding.WriteValue(); 
+            txt.TextChanged += (sender, e) =>
+            {
+                binding.WriteValue();
             };
 
             return binding;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/ViewContentBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/ViewContentBase.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/ViewContentBase.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Shared.UI
@@ -90,14 +90,14 @@
             _parent.FormClosing += new FormClosingEventHandler(OnParentFormClosed);
         }
 
-        void OnParentFormClosed(object sender, FormClosingEventArgs e)
+        private void OnParentFormClosed(object sender, FormClosingEventArgs e)
         {
             var h = this.ViewContentClosed;
             if (h != null)
                 h(this, EventArgs.Empty);
         }
 
-        void OnParentFormClosing(object sender, FormClosingEventArgs e)
+        private void OnParentFormClosing(object sender, FormClosingEventArgs e)
         {
             e.Cancel = CheckCancelEvents();
         }
@@ -288,7 +288,7 @@
         {
             get { return ViewRegion.Document; }
         }
-        
+
         /// <summary>
         /// Gets the icon for this view
         /// </summary>
@@ -307,4 +307,4 @@
         /// </summary>
         public event EventHandler ViewContentShowing;
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/ViewContentManagerBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/ViewContentManagerBase.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/ViewContentManagerBase.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.Text;
-using Maestro.Shared.UI;
 
 namespace Maestro.Shared.UI
 {
@@ -233,7 +234,7 @@
     /// <summary>
     /// An EventArgs that carries a view instance
     /// </summary>
-    public class ViewEventArgs : EventArgs 
+    public class ViewEventArgs : EventArgs
     {
         /// <summary>
         /// Creates a new instance of ViewEventArgs
@@ -251,9 +252,9 @@
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <param name="sender"></param>
     /// <param name="e"></param>
     public delegate void ViewEventHandler(object sender, ViewEventArgs e);
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/WaitCursor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/WaitCursor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/WaitCursor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Maestro.Shared.UI
@@ -52,4 +53,4 @@
             _owner.Cursor = _orig;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/WorkbenchBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/WorkbenchBase.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/WorkbenchBase.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using WeifenLuo.WinFormsUI.Docking;
 
@@ -33,17 +32,17 @@
     /// </summary>
     public partial class WorkbenchBase : Form
     {
-        MenuStrip menu;
-        ToolStripContainer toolStripContainer;
-        ToolStrip toolbar;
-        
-        StatusStrip status;
-        ToolStripStatusLabel statusLabel;
+        private MenuStrip menu;
+        private ToolStripContainer toolStripContainer;
+        private ToolStrip toolbar;
 
-        DockPanel contentPanel;
+        private StatusStrip status;
+        private ToolStripStatusLabel statusLabel;
 
-        ContextMenuStrip ctxToolbar;
+        private DockPanel contentPanel;
 
+        private ContextMenuStrip ctxToolbar;
+
         private IWorkbenchInitializer _workbenchInitializer;
 
         private WorkbenchBase()
@@ -55,7 +54,8 @@
         /// Initializes a new instance of the WorkbenchBase class
         /// </summary>
         /// <param name="init"></param>
-        protected WorkbenchBase(IWorkbenchInitializer init) : this()
+        protected WorkbenchBase(IWorkbenchInitializer init)
+            : this()
         {
             _workbenchInitializer = init;
             _toolstrips = new Dictionary<string, ToolStrip>();
@@ -72,7 +72,7 @@
             contentPanel.DockLeftPortion = 250;
             contentPanel.DockBottomPortion = 150;
             contentPanel.DockRightPortion = 200;
-            
+
             menu = _workbenchInitializer.GetMainMenu(this);
 
             toolStripContainer = new ToolStripContainer();
@@ -93,7 +93,7 @@
             toolbar.Tag = BASE_TOOLSTRIP;
 
             AddToolbar(toolbar.Tag.ToString(), toolbar, ToolbarRegion.Top, true); //NOXLATE
-            
+
             status = new StatusStrip();
             statusLabel = new ToolStripStatusLabel();
             status.Items.Add(statusLabel);
@@ -105,7 +105,7 @@
             Application.Idle += OnApplicationIdle;
         }
 
-        void OnActiveDocumentChanged(object sender, EventArgs e)
+        private void OnActiveDocumentChanged(object sender, EventArgs e)
         {
             var doc = contentPanel.ActiveDocument as DockContent;
             if (doc != null)
@@ -116,14 +116,16 @@
             }
         }
 
-        const string BASE_TOOLSTRIP = "Base"; //NOXLATE
+        private const string BASE_TOOLSTRIP = "Base"; //NOXLATE
 
         /// <summary>
         /// Called when a view content has been activated
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="content"></param>
-        protected virtual void OnViewActivated(object sender, IViewContent content) { }
+        protected virtual void OnViewActivated(object sender, IViewContent content)
+        {
+        }
 
         private Dictionary<string, ToolStrip> _toolstrips;
         private Dictionary<string, ToolbarRegion> _toolstripRegions;
@@ -159,12 +161,15 @@
                 case ToolbarRegion.Top:
                     AddTopToolStrip(toolbar);
                     break;
+
                 case ToolbarRegion.Bottom:
                     toolStripContainer.BottomToolStripPanel.Controls.Add(toolbar);
                     break;
+
                 case ToolbarRegion.Left:
                     toolStripContainer.LeftToolStripPanel.Controls.Add(toolbar);
                     break;
+
                 case ToolbarRegion.Right:
                     toolStripContainer.RightToolStripPanel.Controls.Add(toolbar);
                     break;
@@ -189,12 +194,15 @@
                         case ToolbarRegion.Bottom:
                             toolStripContainer.BottomToolStripPanel.Controls.Add(strip);
                             break;
+
                         case ToolbarRegion.Left:
                             toolStripContainer.LeftToolStripPanel.Controls.Add(strip);
                             break;
+
                         case ToolbarRegion.Right:
                             toolStripContainer.RightToolStripPanel.Controls.Add(strip);
                             break;
+
                         case ToolbarRegion.Top:
                             AddTopToolStrip(strip);
                             break;
@@ -207,12 +215,15 @@
                         case ToolbarRegion.Bottom:
                             toolStripContainer.BottomToolStripPanel.Controls.Remove(strip);
                             break;
+
                         case ToolbarRegion.Left:
                             toolStripContainer.LeftToolStripPanel.Controls.Remove(strip);
                             break;
+
                         case ToolbarRegion.Right:
                             toolStripContainer.RightToolStripPanel.Controls.Remove(strip);
                             break;
+
                         case ToolbarRegion.Top:
                             toolStripContainer.TopToolStripPanel.Controls.Remove(strip);
                             break;
@@ -231,7 +242,7 @@
             var panel = toolStripContainer.TopToolStripPanel;
             if ((string)strip.Tag == BASE_TOOLSTRIP)
                 panel.Controls.Add(strip);
-            else 
+            else
             {
                 var controls = new List<Control>();
                 panel.SuspendLayout();
@@ -299,7 +310,7 @@
         public IViewContent ActiveDocumentView
         {
             get
-            { 
+            {
                 var doc = contentPanel.ActiveDocument as DockContent;
                 if (doc != null)
                     return doc.Tag as IViewContent;
@@ -361,13 +372,13 @@
                 content.StartPosition = FormStartPosition.CenterParent;
                 content.ShowDialog();
             }
-            else 
+            else
             {
                 content.Show(contentPanel);
             }
         }
 
-        void OnApplicationIdle(object sender, EventArgs e)
+        private void OnApplicationIdle(object sender, EventArgs e)
         {
             // Use the Idle event to update the status of menu and toolbar.
             // Depending on your application and the number of menu items with complex conditions,
@@ -434,17 +445,20 @@
         /// On the top
         /// </summary>
         Top,
+
         /// <summary>
         /// On the left
         /// </summary>
         Left,
+
         /// <summary>
         /// On the right
         /// </summary>
         Right,
+
         /// <summary>
         /// On the bottom
         /// </summary>
         Bottom
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/packages.config
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/packages.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/packages.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DockPanelSuite" version="2.9.0.0" targetFramework="net40-Client" />
+    <package id="DockPanelSuite" version="2.9.0.0" targetFramework="net40-Client" />
 </packages>
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITestRunner/App.config
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/App.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/App.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -3,13 +3,15 @@
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
-                <assemblyIdentity name="MapGuideDotNetApi" publicKeyToken="f526c48929fda856"/>
+                <assemblyIdentity name="MapGuideDotNetApi" publicKeyToken="f526c48929fda856" />
 
-                <codeBase version="1.0.0.1" href="MapGuideDotNetApi-2.2.dll"/>
+                <codeBase version="1.0.0.1" href="MapGuideDotNetApi-2.2.dll" />
 
-                <bindingRedirect oldVersion="2.0.0.2308" newVersion="1.0.0.1"/>
-
+                <bindingRedirect oldVersion="2.0.0.2308" newVersion="1.0.0.1" />
             </dependentAssembly>
-		</assemblyBinding>
+        </assemblyBinding>
     </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+    </startup>
+</configuration>
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITestRunner/ConnectionProviders.SDK.xml
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/ConnectionProviders.SDK.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/ConnectionProviders.SDK.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -14,4 +14,4 @@
         <Type>OSGeo.MapGuide.MaestroAPI.LocalNativeConnection</Type>
     </ConnectionProvider>
     -->
-</ConnectionProviderRegistry>
+</ConnectionProviderRegistry>
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITestRunner/ConnectionProviders.xml
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/ConnectionProviders.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/ConnectionProviders.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -6,7 +6,7 @@
         <Assembly>OSGeo.MapGuide.MaestroAPI.Http.dll</Assembly>
         <Type>OSGeo.MapGuide.MaestroAPI.HttpServerConnection</Type>
     </ConnectionProvider>
-    
+
     <ConnectionProvider>
         <Name>Maestro.LocalNative</Name>
         <Description>Connection using the MapGuide Web API</Description>
@@ -20,4 +20,4 @@
         <Assembly>OSGeo.MapGuide.MaestroAPI.Local.dll</Assembly>
         <Type>OSGeo.MapGuide.MaestroAPI.LocalConnection</Type>
     </ConnectionProvider>
-</ConnectionProviderRegistry>
+</ConnectionProviderRegistry>
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITestRunner/Program.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/Program.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/Program.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,40 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Diagnostics;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using MaestroAPITests;
+//
 
+#endregion Disclaimer / License
+
 namespace MaestroAPITestRunner
 {
     /// <summary>
     /// This is a simple NUnit test runner, to work around the fact that you can't launch an external program
     /// in a debug session (in our case, nunit-console.exe) in Visual Studio Express.
     /// </summary>
-    class Program
+    internal class Program
     {
-        static void Main(string[] args)
+        private static void Main(string[] args)
         {
             //NOTE: Maestro.Local and Maestro.LocalNative unit tests cannot be run at the
             //same time. They are mutually exclusive. You will need to remove the postbuild
@@ -64,8 +58,8 @@
                 runnerArgs[0] = args[0];
             else
                 runnerArgs[0] = "MaestroAPITests.dll";
-            
+
             NUnit.ConsoleRunner.Runner.Main(runnerArgs);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITestRunner/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("MaestroAPITestRunner")]
@@ -14,8 +13,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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)]
 
@@ -25,12 +24,12 @@
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITestRunner/TestMaestroAPI.LocalNative.xml
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/TestMaestroAPI.LocalNative.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/TestMaestroAPI.LocalNative.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -7,9 +7,9 @@
 -->
 <TestConfiguration>
   <TestSettings>
-    <!-- 
-    The path to webconfig.ini required by the LocalNative provider to run its specific tests. Should come from the same 
-    MapGuide installation where you have sourced the .net assemblies used to build your own LocalNative provider with the 
+    <!--
+    The path to webconfig.ini required by the LocalNative provider to run its specific tests. Should come from the same
+    MapGuide installation where you have sourced the .net assemblies used to build your own LocalNative provider with the
     ProviderTemplate tool in the Maestro SDK
     -->
     <LocalNativeConfigFile>C:\Program Files\OSGeo\MapGuide\Web\www\webconfig.ini</LocalNativeConfigFile>

Modified: trunk/Tools/Maestro/MaestroAPITestRunner/TestMaestroAPI.xml
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/TestMaestroAPI.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/TestMaestroAPI.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -6,9 +6,9 @@
 -->
 <TestConfiguration>
   <TestSettings>
-    <!-- 
-    The path to webconfig.ini required by the LocalNative provider to run its specific tests. Should come from the same 
-    MapGuide installation where you have sourced the .net assemblies used to build your own LocalNative provider with the 
+    <!--
+    The path to webconfig.ini required by the LocalNative provider to run its specific tests. Should come from the same
+    MapGuide installation where you have sourced the .net assemblies used to build your own LocalNative provider with the
     ProviderTemplate tool in the Maestro SDK
     -->
     <LocalNativeConfigFile>C:\Program Files\OSGeo\MapGuide\Web\www\webconfig.ini</LocalNativeConfigFile>
@@ -56,7 +56,7 @@
     <!-- Functionality that uses the Local connection provider -->
     <IgnoreLocalRuntimeMapTests>false</IgnoreLocalRuntimeMapTests>
     <IgnoreLocalFeatureTests>false</IgnoreLocalFeatureTests>
-    <!-- 
+    <!--
     Local Native connection provider tests are disabled as the standard test profile does not cover
     this functionality. The Test Runner configuration in the Maestro SDK enables such tests, while
     disabling the Local Connection ones (because it doesn't include mg-desktop and supporting libs/datafiles)

Modified: trunk/Tools/Maestro/MaestroAPITestRunner/packages.config
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/packages.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/packages.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="fleesharp" version="0.9.27-pre" targetFramework="net40" />
-  <package id="mapguide-api-base-x86" version="2.5.2.7949" targetFramework="net40" />
-  <package id="mg-desktop-net40-x86" version="2.5.2.7949" targetFramework="net40" />
+    <package id="fleesharp" version="0.9.27-pre" targetFramework="net40" />
+    <package id="mapguide-api-base-x86" version="2.5.2.7949" targetFramework="net40" />
+    <package id="mg-desktop-net40-x86" version="2.5.2.7949" targetFramework="net40" />
 </packages>
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/CapabilityTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/CapabilityTests.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/CapabilityTests.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using NMock2;
 using NUnit.Framework;
-using NMock2;
 using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
 using OSGeo.MapGuide.MaestroAPI.Http;
 using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
+using System;
 
 namespace MaestroAPITests
 {
@@ -61,54 +62,62 @@
                                 caps.GetMaxSupportedResourceVersion(type.ToString());
                                 Assert.Fail("MGOS 1.0.0 doesn't support fusion!");
                             }
-                            catch (UnsupportedResourceTypeException ex) 
+                            catch (UnsupportedResourceTypeException ex)
                             {
                                 Assert.AreEqual(ex.ResourceType, ResourceTypes.ApplicationDefinition.ToString());
                             }
                         }
                         break;
+
                     case ResourceTypes.DrawingSource:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.FeatureSource:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.LayerDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.LoadProcedure:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.MapDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.PrintLayout:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.SymbolLibrary:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.SymbolDefinition:
                         {
                             try
@@ -116,12 +125,13 @@
                                 caps.GetMaxSupportedResourceVersion(type.ToString());
                                 Assert.Fail("MGOS 1.0.0 doesn't support advanced symbology!");
                             }
-                            catch (UnsupportedResourceTypeException ex) 
+                            catch (UnsupportedResourceTypeException ex)
                             {
                                 Assert.AreEqual(ex.ResourceType, ResourceTypes.SymbolDefinition.ToString());
                             }
                         }
                         break;
+
                     case ResourceTypes.WebLayout:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
@@ -141,26 +151,31 @@
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Feature:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Fusion:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) < 0);
                         }
                         break;
+
                     case ServiceType.Mapping:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Resource:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Tile:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
@@ -198,54 +213,62 @@
                                 caps.GetMaxSupportedResourceVersion(type.ToString());
                                 Assert.Fail("MGOS 1.1.0 doesn't support fusion!");
                             }
-                            catch (UnsupportedResourceTypeException ex) 
+                            catch (UnsupportedResourceTypeException ex)
                             {
                                 Assert.AreEqual(ex.ResourceType, ResourceTypes.ApplicationDefinition.ToString());
                             }
                         }
                         break;
+
                     case ResourceTypes.DrawingSource:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.FeatureSource:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.LayerDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.LoadProcedure:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.MapDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.PrintLayout:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.SymbolLibrary:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.SymbolDefinition:
                         {
                             try
@@ -253,12 +276,13 @@
                                 caps.GetMaxSupportedResourceVersion(type.ToString());
                                 Assert.Fail("MGOS 1.1.0 doesn't support advanced symbology!");
                             }
-                            catch (UnsupportedResourceTypeException ex) 
+                            catch (UnsupportedResourceTypeException ex)
                             {
                                 Assert.AreEqual(ex.ResourceType, ResourceTypes.SymbolDefinition.ToString());
                             }
                         }
                         break;
+
                     case ResourceTypes.WebLayout:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
@@ -278,26 +302,31 @@
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Feature:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Fusion:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) < 0);
                         }
                         break;
+
                     case ServiceType.Mapping:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Resource:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Tile:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
@@ -335,60 +364,69 @@
                                 caps.GetMaxSupportedResourceVersion(type.ToString());
                                 Assert.Fail("MGOS 1.2.0 doesn't support fusion!");
                             }
-                            catch (UnsupportedResourceTypeException ex) 
+                            catch (UnsupportedResourceTypeException ex)
                             {
                                 Assert.AreEqual(ex.ResourceType, ResourceTypes.ApplicationDefinition.ToString());
                             }
                         }
                         break;
+
                     case ResourceTypes.DrawingSource:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.FeatureSource:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.LayerDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 1, 0));
                         }
                         break;
+
                     case ResourceTypes.LoadProcedure:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.MapDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.PrintLayout:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.SymbolLibrary:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.SymbolDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.WebLayout:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
@@ -408,26 +446,31 @@
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Feature:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Fusion:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) < 0);
                         }
                         break;
+
                     case ServiceType.Mapping:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Resource:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Tile:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
@@ -463,54 +506,63 @@
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.DrawingSource:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.FeatureSource:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.LayerDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 2, 0));
                         }
                         break;
+
                     case ResourceTypes.LoadProcedure:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 1, 0));
                         }
                         break;
+
                     case ResourceTypes.MapDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.PrintLayout:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.SymbolLibrary:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.SymbolDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 1, 0));
                         }
                         break;
+
                     case ResourceTypes.WebLayout:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
@@ -530,26 +582,31 @@
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Feature:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Fusion:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Mapping:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Resource:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Tile:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
@@ -584,54 +641,63 @@
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.DrawingSource:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.FeatureSource:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.LayerDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 3, 0));
                         }
                         break;
+
                     case ResourceTypes.LoadProcedure:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 1, 0));
                         }
                         break;
+
                     case ResourceTypes.MapDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.PrintLayout:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.SymbolLibrary:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.SymbolDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 1, 0));
                         }
                         break;
+
                     case ResourceTypes.WebLayout:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
@@ -651,26 +717,31 @@
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Feature:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Fusion:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Mapping:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Resource:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Tile:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
@@ -705,54 +776,63 @@
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.DrawingSource:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.FeatureSource:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.LayerDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 3, 0));
                         }
                         break;
+
                     case ResourceTypes.LoadProcedure:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(2, 2, 0));
                         }
                         break;
+
                     case ResourceTypes.MapDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.PrintLayout:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.SymbolLibrary:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.SymbolDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 1, 0));
                         }
                         break;
+
                     case ResourceTypes.WebLayout:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
@@ -772,26 +852,31 @@
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Feature:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Fusion:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Mapping:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Resource:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Tile:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
@@ -826,60 +911,70 @@
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.DrawingSource:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.FeatureSource:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.LayerDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(2, 3, 0));
                         }
                         break;
+
                     case ResourceTypes.LoadProcedure:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(2, 2, 0));
                         }
                         break;
+
                     case ResourceTypes.MapDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(2, 3, 0));
                         }
                         break;
+
                     case ResourceTypes.PrintLayout:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.SymbolLibrary:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.SymbolDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 1, 0));
                         }
                         break;
+
                     case ResourceTypes.WatermarkDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(2, 3, 0));
                         }
                         break;
+
                     case ResourceTypes.WebLayout:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
@@ -899,26 +994,31 @@
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Feature:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Fusion:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Mapping:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Resource:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Tile:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
@@ -952,60 +1052,70 @@
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.DrawingSource:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.FeatureSource:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.LayerDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(2, 4, 0));
                         }
                         break;
+
                     case ResourceTypes.LoadProcedure:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(2, 2, 0));
                         }
                         break;
+
                     case ResourceTypes.MapDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(2, 4, 0));
                         }
                         break;
+
                     case ResourceTypes.PrintLayout:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.SymbolLibrary:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.SymbolDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(2, 4, 0));
                         }
                         break;
+
                     case ResourceTypes.WatermarkDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(2, 4, 0));
                         }
                         break;
+
                     case ResourceTypes.WebLayout:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
@@ -1025,26 +1135,31 @@
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Feature:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Fusion:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Mapping:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Resource:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Tile:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
@@ -1078,60 +1193,70 @@
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.DrawingSource:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.FeatureSource:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.LayerDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(2, 4, 0));
                         }
                         break;
+
                     case ResourceTypes.LoadProcedure:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(2, 2, 0));
                         }
                         break;
+
                     case ResourceTypes.MapDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(2, 4, 0));
                         }
                         break;
+
                     case ResourceTypes.PrintLayout:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.SymbolLibrary:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.SymbolDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(2, 4, 0));
                         }
                         break;
+
                     case ResourceTypes.WatermarkDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(2, 4, 0));
                         }
                         break;
+
                     case ResourceTypes.WebLayout:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
@@ -1151,26 +1276,31 @@
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Feature:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Fusion:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Mapping:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Resource:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Tile:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
@@ -1204,60 +1334,70 @@
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.DrawingSource:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.FeatureSource:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.LayerDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(2, 4, 0));
                         }
                         break;
+
                     case ResourceTypes.LoadProcedure:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(2, 2, 0));
                         }
                         break;
+
                     case ResourceTypes.MapDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(2, 4, 0));
                         }
                         break;
+
                     case ResourceTypes.PrintLayout:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.SymbolLibrary:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(1, 0, 0));
                         }
                         break;
+
                     case ResourceTypes.SymbolDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(2, 4, 0));
                         }
                         break;
+
                     case ResourceTypes.WatermarkDefinition:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
                             Assert.AreEqual(version, new Version(2, 4, 0));
                         }
                         break;
+
                     case ResourceTypes.WebLayout:
                         {
                             var version = caps.GetMaxSupportedResourceVersion(type.ToString());
@@ -1277,26 +1417,31 @@
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Feature:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Fusion:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Mapping:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Resource:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
                         }
                         break;
+
                     case ServiceType.Tile:
                         {
                             Assert.IsTrue(Array.IndexOf<int>(services, (int)st) >= 0);
@@ -1311,4 +1456,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/ConfigurationTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/ConfigurationTests.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/ConfigurationTests.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using NUnit.Framework;
 using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
 using OSGeo.MapGuide.ObjectModels.Common;
+using System.Drawing;
 using System.IO;
-using System.Drawing;
 
 namespace MaestroAPITests
 {
@@ -126,7 +126,7 @@
             ov.SpatialContextName = sc.Name;
             ov.XColumn = "Lon";
             ov.YColumn = "Lat";
-            
+
             conf.AddOverride(ov);
 
             string path = "OdbcConfigTest.xml";
@@ -242,4 +242,4 @@
             Assert.AreEqual(5, item.Layers.Length);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/ConnectionTestBase.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/ConnectionTestBase.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/ConnectionTestBase.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,22 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using NUnit.Framework;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Commands;
@@ -503,7 +506,6 @@
             }
             catch //Exception or false I can't remember, as long as the result is not "true"
             {
-
             }
 
             //Encrypt credentials, but use bogus username/password
@@ -607,7 +609,7 @@
             var resSvc = conn.ResourceService;
             resSvc.SetResourceXmlData("Library://UnitTests/Maps/SheboyganWithInvalidLayers.MapDefinition", File.OpenRead("UserTestData/TestMapWithInvalidLayers.xml"));
             resSvc.SetResourceXmlData("Library://UnitTests/Layers/InvalidLayer.LayerDefinition", File.OpenRead("UserTestData/InvalidLayer.xml"));
-            
+
             if (Array.IndexOf(conn.Capabilities.SupportedServices, (int)ServiceType.Mapping) < 0)
             {
                 Assert.Ignore("Connection does not support the Mapping Service");
@@ -655,4 +657,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/ExpressionTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/ExpressionTests.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/ExpressionTests.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using NUnit.Framework;
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
+using OSGeo.MapGuide.MaestroAPI.Expression;
+using OSGeo.MapGuide.MaestroAPI.Http;
 using System;
-using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
 using System.Text;
-using NUnit.Framework;
-using OSGeo.MapGuide.MaestroAPI;
-using System.IO;
-using OSGeo.MapGuide.MaestroAPI.Expression;
 using System.Threading;
-using System.Diagnostics;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using OSGeo.MapGuide.MaestroAPI.Http;
 
 namespace MaestroAPITests
 {
@@ -114,7 +115,7 @@
             var past1 = exprReader.Evaluate("AddMonths(CurrentDate(), -3)");
             Assert.NotNull(past1);
             Trace.WriteLine("past1: " + past1.ToString());
-            
+
             Thread.Sleep(50);
 
             Assert.IsTrue(exprReader.ReadNext());
@@ -474,7 +475,6 @@
         [Test]
         public void TestMathLog()
         {
-            
         }
 
         public void TestMathMod()
@@ -1047,4 +1047,4 @@
             exprReader.Close();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/FeatureReaderTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/FeatureReaderTests.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/FeatureReaderTests.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using NUnit.Framework;
-using System.Xml;
+using OSGeo.MapGuide.MaestroAPI.Http;
 using System.IO;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Http;
+using System.Text;
 
 namespace MaestroAPITests
 {
@@ -80,11 +79,13 @@
                         Assert.IsFalse(feat.IsNull(1));
                         Assert.IsFalse(feat.IsNull(2));
                         break;
+
                     case 1:
                         Assert.IsFalse(feat.IsNull(0));
                         Assert.IsFalse(feat.IsNull(1));
                         Assert.IsTrue(feat.IsNull(2));
                         break;
+
                     case 2:
                         Assert.IsFalse(feat.IsNull(0));
                         Assert.IsTrue(feat.IsNull(1));
@@ -153,11 +154,13 @@
                         Assert.IsFalse(reader.IsNull(1));
                         Assert.IsFalse(reader.IsNull(2));
                         break;
+
                     case 1:
                         Assert.IsFalse(reader.IsNull(0));
                         Assert.IsFalse(reader.IsNull(1));
                         Assert.IsTrue(reader.IsNull(2));
                         break;
+
                     case 2:
                         Assert.IsFalse(reader.IsNull(0));
                         Assert.IsTrue(reader.IsNull(1));
@@ -168,4 +171,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/HttpConnectionTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/HttpConnectionTests.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/HttpConnectionTests.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using NUnit.Framework;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using System.IO;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
+using System;
+using System.Collections.Generic;
 using System.Threading;
 
 namespace MaestroAPITests
@@ -84,7 +81,7 @@
         {
             base.TestAnyStreamInput();
         }
-        
+
         [Test]
         public override void TestCreateFromExistingSession()
         {
@@ -207,7 +204,7 @@
             var builder = new RequestBuilder(new Uri("http://tempuri.org"), "en");
             var conn = new HttpServerConnection(builder);
 
-            //Work through the interface 
+            //Work through the interface
             IServerConnection isvc = (IServerConnection)conn;
 
             //UserAgent is exposed as a custom property
@@ -245,7 +242,7 @@
             var conn = new HttpServerConnection(builder);
             conn.SetSiteVersion(new Version(1, 2, 0));
 
-            //Work through the interface 
+            //Work through the interface
             IServerConnection isvc = (IServerConnection)conn;
             int[] stypes = isvc.Capabilities.SupportedServices;
             foreach (int st in stypes)
@@ -276,4 +273,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/HttpSiteTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/HttpSiteTests.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/HttpSiteTests.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using NUnit.Framework;
 using OSGeo.MapGuide.MaestroAPI;
-using NUnit.Framework;
+using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
 using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
 using System.IO;
+using System.Linq;
 
 namespace MaestroAPITests
 {
@@ -118,4 +118,4 @@
             Assert.True(issues.Any(x => x.StatusCode == ValidationStatusCode.Error_SymbolDefinition_ImageGraphicReferenceResourceDataNotFound));
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/LocalConnectionTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/LocalConnectionTests.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/LocalConnectionTests.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,37 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using NUnit.Framework;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Feature;
-using OSGeo.MapGuide.MaestroAPI.Commands;
-using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
-using OSGeo.MapGuide.MaestroAPI.Internal;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.ObjectModels.Common;
-using System.IO;
-using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
+using System;
 
 namespace MaestroAPITests
 {
@@ -146,4 +137,4 @@
             throw new NotImplementedException();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/LocalNativeFeatureTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/LocalNativeFeatureTests.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/LocalNativeFeatureTests.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,37 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using NUnit.Framework;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Feature;
-using OSGeo.MapGuide.MaestroAPI.Commands;
-using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
-using OSGeo.MapGuide.MaestroAPI.Internal;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.ObjectModels.Common;
-using System.IO;
-using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
 
 namespace MaestroAPITests
 {
@@ -141,4 +131,4 @@
                 "SessionId", orig.SessionID);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/LocalNativePerformanceTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/LocalNativePerformanceTests.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/LocalNativePerformanceTests.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using NUnit.Framework;
 using System.Diagnostics;
 
@@ -46,4 +46,4 @@
             Trace.TraceInformation("ResourceExists() executed in {0}ms", sw.ElapsedMilliseconds);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/MiscTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/MiscTests.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/MiscTests.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using NUnit.Framework;
 using OSGeo.MapGuide.MaestroAPI.Internal;
 
@@ -55,4 +55,4 @@
             reader.Read(wkt1);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/ObjectTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/ObjectTests.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/ObjectTests.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,36 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using NUnit.Framework;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.MaestroAPI;
+using System;
 
 namespace MaestroAPITests
 {
     /// <summary>
     /// This test fixture is to ensure all objects created by <see cref="ObjectFactory"/> have no
     /// null child object properties where there shouldn't be any.
-    /// 
+    ///
     /// Also tests for various classes (not belonging to any particular group) reside here
     /// </summary>
     [TestFixture]
@@ -112,4 +113,4 @@
             Assert.AreEqual(0, meta.GetProperties().Count);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("MaestroAPITests")]
@@ -14,8 +13,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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)]
 
@@ -25,12 +24,12 @@
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/ResourceTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/ResourceTests.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/ResourceTests.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,47 +1,40 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.IO;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 using NMock2;
 using NUnit.Framework;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Resource.Conversion;
-using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using OSGeo.MapGuide.ObjectModels.LoadProcedure;
 using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.ObjectModels.PrintLayout;
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-using OSGeo.MapGuide.ObjectModels.SymbolLibrary;
 using OSGeo.MapGuide.ObjectModels.WebLayout;
+using System;
+using System.Collections.Specialized;
 using System.Diagnostics;
+using System.IO;
 
 namespace MaestroAPITests
 {
@@ -123,7 +116,9 @@
             //Verify that only valid resource identifiers can be assigned to certain resource types.
 
             IResource res = ObjectFactory.CreateFeatureSource(conn, "OSGeo.SDF");
+
             #region Feature Source
+
             try
             {
                 res.ResourceID = "dklgjlahekjedjfd";
@@ -153,30 +148,33 @@
             {
                 Assert.Fail("Resource ID should've checked out");
             }
-            #endregion
 
+            #endregion Feature Source
+
             res = ObjectFactory.CreateDrawingSource(conn);
+
             #region Drawing Source
+
             try
             {
                 res.ResourceID = "dklgjlahekjedjfd";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
                 res.ResourceID = "Library://UnitTests/";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
                 res.ResourceID = "Library://UnitTests/Test.FeatureSource";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
@@ -186,30 +184,33 @@
             {
                 Assert.Fail("Resource ID should've checked out");
             }
-            #endregion
 
+            #endregion Drawing Source
+
             res = ObjectFactory.CreateMapDefinition(conn, "Test Map");
+
             #region Map Definition
+
             try
             {
                 res.ResourceID = "dklgjlahekjedjfd";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
                 res.ResourceID = "Library://UnitTests/";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
                 res.ResourceID = "Library://UnitTests/Test.DrawingSource";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
@@ -219,30 +220,33 @@
             {
                 Assert.Fail("Resource ID should've checked out");
             }
-            #endregion
 
+            #endregion Map Definition
+
             res = ObjectFactory.CreateWebLayout(conn, new Version(1, 0, 0), "Library://Test.MapDefinition");
+
             #region Web Layout
+
             try
             {
                 res.ResourceID = "dklgjlahekjedjfd";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
                 res.ResourceID = "Library://UnitTests/";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
                 res.ResourceID = "Library://UnitTests/Test.DrawingSource";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
@@ -252,30 +256,33 @@
             {
                 Assert.Fail("Resource ID should've checked out");
             }
-            #endregion
 
+            #endregion Web Layout
+
             res = ObjectFactory.DeserializeEmbeddedFlexLayout(conn);
+
             #region Application Definition
+
             try
             {
                 res.ResourceID = "dklgjlahekjedjfd";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
                 res.ResourceID = "Library://UnitTests/";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
                 res.ResourceID = "Library://UnitTests/Test.DrawingSource";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
@@ -285,30 +292,33 @@
             {
                 Assert.Fail("Resource ID should've checked out");
             }
-            #endregion
 
+            #endregion Application Definition
+
             res = ObjectFactory.CreateSimpleSymbol(conn, new Version(1, 0, 0), "Test", "Test Symbol");
+
             #region Simple Symbol Definition
+
             try
             {
                 res.ResourceID = "dklgjlahekjedjfd";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
                 res.ResourceID = "Library://UnitTests/";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
                 res.ResourceID = "Library://UnitTests/Test.DrawingSource";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
@@ -318,30 +328,33 @@
             {
                 Assert.Fail("Resource ID should've checked out");
             }
-            #endregion
 
+            #endregion Simple Symbol Definition
+
             res = ObjectFactory.CreateCompoundSymbol(conn, new Version(1, 0, 0), "Test", "Test Symbol");
+
             #region Compound Symbol Definition
+
             try
             {
                 res.ResourceID = "dklgjlahekjedjfd";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
                 res.ResourceID = "Library://UnitTests/";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
                 res.ResourceID = "Library://UnitTests/Test.DrawingSource";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
@@ -351,30 +364,33 @@
             {
                 Assert.Fail("Resource ID should've checked out");
             }
-            #endregion
 
+            #endregion Compound Symbol Definition
+
             res = ObjectFactory.CreateLoadProcedure(conn, LoadType.Sdf, null);
+
             #region Load Procedure
+
             try
             {
                 res.ResourceID = "dklgjlahekjedjfd";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
                 res.ResourceID = "Library://UnitTests/";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
                 res.ResourceID = "Library://UnitTests/Test.DrawingSource";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
@@ -384,10 +400,13 @@
             {
                 Assert.Fail("Resource ID should've checked out");
             }
-            #endregion
 
+            #endregion Load Procedure
+
             res = ObjectFactory.CreateLoadProcedure(conn, LoadType.Shp, null);
+
             #region Load Procedure
+
             try
             {
                 res.ResourceID = "dklgjlahekjedjfd";
@@ -417,30 +436,33 @@
             {
                 Assert.Fail("Resource ID should've checked out");
             }
-            #endregion
 
+            #endregion Load Procedure
+
             res = ObjectFactory.CreatePrintLayout(conn);
+
             #region Print Layout
+
             try
             {
                 res.ResourceID = "dklgjlahekjedjfd";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
                 res.ResourceID = "Library://UnitTests/";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
                 res.ResourceID = "Library://UnitTests/Test.DrawingSource";
                 Assert.Fail("Should've thrown exception on invalid resource id");
             }
-            catch (InvalidOperationException){ }
+            catch (InvalidOperationException) { }
 
             try
             {
@@ -450,7 +472,8 @@
             {
                 Assert.Fail("Resource ID should've checked out");
             }
-            #endregion
+
+            #endregion Print Layout
         }
 
         [Test]
@@ -498,7 +521,7 @@
 
             var fs = ObjectFactory.CreateFeatureSource(conn, "OSGeo.SDF");
             Assert.IsTrue(fs.ConnectionString.Length == 0);
-            
+
             var connParams = new NameValueCollection();
             connParams["File"] = "%MG_DATA_FILE_PATH%Foo.sdf";
 
@@ -509,7 +532,7 @@
             Assert.AreEqual(fs.GetEmbeddedDataName(), "Foo.sdf");
             Assert.Catch<InvalidOperationException>(() => fs.GetAliasedFileName());
             Assert.Catch<InvalidOperationException>(() => fs.GetAliasName());
-            
+
             connParams.Clear();
             connParams["File"] = "%MG_DATA_FILE_PATH%Bar.sdf";
             connParams["ReadOnly"] = "TRUE";
@@ -521,7 +544,7 @@
             Assert.AreEqual(fs.GetEmbeddedDataName(), "Bar.sdf");
             Assert.Catch<InvalidOperationException>(() => fs.GetAliasedFileName());
             Assert.Catch<InvalidOperationException>(() => fs.GetAliasName());
-            
+
             connParams.Clear();
             connParams["DefaultFileLocation"] = "%MG_DATA_PATH_ALIAS[foobar]%";
 
@@ -532,7 +555,7 @@
             Assert.AreEqual(fs.GetAliasName(), "foobar");
             Assert.IsEmpty(fs.GetAliasedFileName());
             Assert.Catch<InvalidOperationException>(() => fs.GetEmbeddedDataName());
-            
+
             connParams.Clear();
             connParams["DefaultFileLocation"] = "%MG_DATA_PATH_ALIAS[foobar]%Test.sdf";
 
@@ -543,7 +566,7 @@
             Assert.AreEqual(fs.GetAliasName(), "foobar");
             Assert.AreEqual(fs.GetAliasedFileName(), "Test.sdf");
             Assert.Catch<InvalidOperationException>(() => fs.GetEmbeddedDataName());
-            
+
             connParams.Clear();
             connParams["DefaultFileLocation"] = "%MG_DATA_PATH_ALIAS[foobar]%Test.sdf";
             connParams["ReadOnly"] = "TRUE";
@@ -555,7 +578,7 @@
             Assert.AreEqual(fs.GetAliasName(), "foobar");
             Assert.AreEqual(fs.GetAliasedFileName(), "Test.sdf");
             Assert.Catch<InvalidOperationException>(() => fs.GetEmbeddedDataName());
-            
+
             connParams.Clear();
             connParams["Service"] = "(local)\\SQLEXPRESS";
             connParams["DataStore"] = "TEST";
@@ -625,7 +648,7 @@
             Assert.AreEqual("LayerDefinition-1.0.0.xsd", ldf.GetResourceTypeDescriptor().XsdName);
             Assert.AreEqual("LayerDefinition-1.0.0.xsd", ldf.ValidatingSchema);
             Assert.AreEqual(new Version(1, 0, 0), ldf.ResourceVersion);
-            
+
             using (var fs = File.OpenWrite("LayerDef_100.xml"))
             {
                 using (var src = ResourceTypeRegistry.Serialize(ldf))
@@ -1090,7 +1113,7 @@
 
             IMapDefinition mdf = ObjectFactory.CreateMapDefinition(conn, "Test");
             /*
-             
+
              [G] Group1
                 [L] Layer1
                 [G] Group2
@@ -1099,7 +1122,7 @@
                       [L] Layer3
              [G] Group4
                 [L] Layer4
-             
+
              */
             var grp1 = mdf.AddGroup("Group1");
             var grp2 = mdf.AddGroup("Group2");
@@ -1133,4 +1156,4 @@
             Assert.NotNull(mdf.GetGroupByName("Group4"));
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/Resources/FeatureJoinSelectSample.xml
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/Resources/FeatureJoinSelectSample.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/Resources/FeatureJoinSelectSample.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -2,18 +2,18 @@
 <FeatureSet>
     <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://fdo.osgeo.org/schemas/feature/TempSchema" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:gml="http://www.opengis.net/gml" xmlns:TempSchema="http://fdo.osgeo.org/schemas/feature/TempSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
         <xs:annotation>
-            <xs:documentation/>
+            <xs:documentation />
         </xs:annotation>
         <xs:complexType name="ParcelFeaturesType" abstract="false" fdo:hasGeometry="false">
             <xs:annotation>
-                <xs:documentation/>
+                <xs:documentation />
             </xs:annotation>
             <xs:complexContent>
                 <xs:extension base="gml:AbstractFeatureType">
                     <xs:sequence>
                         <xs:element name="Autogenerated_ID" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:long"/>
+                                <xs:restriction base="xs:long" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -24,7 +24,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="Geometry" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:geometricTypes="point curve surface solid " fdo:geometryTypes="point multipoint linestring multilinestring curvestring multicurvestring polygon multipolygon curvepolygon multicurvepolygon ">
@@ -34,7 +34,7 @@
                         </xs:element>
                         <xs:element name="DATAFID" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:long"/>
+                                <xs:restriction base="xs:long" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -45,7 +45,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATANAME" minOccurs="0">
@@ -53,7 +53,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATAID" minOccurs="0">
@@ -61,7 +61,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARSTATE" minOccurs="0">
@@ -69,12 +69,12 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARYEAR" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -82,7 +82,7 @@
                         </xs:element>
                         <xs:element name="DATAGEOEXTRA" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -90,7 +90,7 @@
                         </xs:element>
                         <xs:element name="DATARBLDGVC" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -101,12 +101,12 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARLANDVC" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -117,7 +117,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATADETACHED_G" minOccurs="0">
@@ -125,7 +125,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARACRE" minOccurs="0">
@@ -133,7 +133,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARLOT" minOccurs="0">
@@ -141,7 +141,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARNAME" minOccurs="0">
@@ -149,7 +149,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARLDESCR2" minOccurs="0">
@@ -157,12 +157,12 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATANO_UNITS" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -170,7 +170,7 @@
                         </xs:element>
                         <xs:element name="DATALAST_SALE" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:double"/>
+                                <xs:restriction base="xs:double" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -178,7 +178,7 @@
                         </xs:element>
                         <xs:element name="DATAYRBUILT" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -186,7 +186,7 @@
                         </xs:element>
                         <xs:element name="DATARES_BED" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -194,7 +194,7 @@
                         </xs:element>
                         <xs:element name="DATARES_FULL_B" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -205,12 +205,12 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARES_HALF_B" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -221,7 +221,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARLDESCR3" minOccurs="0">
@@ -229,7 +229,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATAATTACHED_G" minOccurs="0">
@@ -237,7 +237,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARCITY" minOccurs="0">
@@ -245,7 +245,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARBILAD" minOccurs="0">
@@ -253,12 +253,12 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATASQFT" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -266,7 +266,7 @@
                         </xs:element>
                         <xs:element name="DATARSQFT" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -274,7 +274,7 @@
                         </xs:element>
                         <xs:element name="DATARZIP" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -285,7 +285,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARSECLN" minOccurs="0">
@@ -293,12 +293,12 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATAGEOMAIN" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -309,7 +309,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARPROCD" minOccurs="0">
@@ -317,12 +317,12 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARWARD" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -9976,18 +9976,18 @@
 <FeatureSet>
     <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://fdo.osgeo.org/schemas/feature/TempSchema" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:gml="http://www.opengis.net/gml" xmlns:TempSchema="http://fdo.osgeo.org/schemas/feature/TempSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
         <xs:annotation>
-            <xs:documentation/>
+            <xs:documentation />
         </xs:annotation>
         <xs:complexType name="ParcelFeaturesType" abstract="false" fdo:hasGeometry="false">
             <xs:annotation>
-                <xs:documentation/>
+                <xs:documentation />
             </xs:annotation>
             <xs:complexContent>
                 <xs:extension base="gml:AbstractFeatureType">
                     <xs:sequence>
                         <xs:element name="Autogenerated_ID" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:long"/>
+                                <xs:restriction base="xs:long" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -9998,7 +9998,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="Geometry" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:geometricTypes="point curve surface solid " fdo:geometryTypes="point multipoint linestring multilinestring curvestring multicurvestring polygon multipolygon curvepolygon multicurvepolygon ">
@@ -10008,7 +10008,7 @@
                         </xs:element>
                         <xs:element name="DATAFID" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:long"/>
+                                <xs:restriction base="xs:long" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -10019,7 +10019,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATANAME" minOccurs="0">
@@ -10027,7 +10027,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATAID" minOccurs="0">
@@ -10035,7 +10035,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARSTATE" minOccurs="0">
@@ -10043,12 +10043,12 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARYEAR" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -10056,7 +10056,7 @@
                         </xs:element>
                         <xs:element name="DATAGEOEXTRA" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -10064,7 +10064,7 @@
                         </xs:element>
                         <xs:element name="DATARBLDGVC" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -10075,12 +10075,12 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARLANDVC" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -10091,7 +10091,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATADETACHED_G" minOccurs="0">
@@ -10099,7 +10099,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARACRE" minOccurs="0">
@@ -10107,7 +10107,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARLOT" minOccurs="0">
@@ -10115,7 +10115,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARNAME" minOccurs="0">
@@ -10123,7 +10123,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARLDESCR2" minOccurs="0">
@@ -10131,12 +10131,12 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATANO_UNITS" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -10144,7 +10144,7 @@
                         </xs:element>
                         <xs:element name="DATALAST_SALE" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:double"/>
+                                <xs:restriction base="xs:double" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -10152,7 +10152,7 @@
                         </xs:element>
                         <xs:element name="DATAYRBUILT" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -10160,7 +10160,7 @@
                         </xs:element>
                         <xs:element name="DATARES_BED" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -10168,7 +10168,7 @@
                         </xs:element>
                         <xs:element name="DATARES_FULL_B" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -10179,12 +10179,12 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARES_HALF_B" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -10195,7 +10195,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARLDESCR3" minOccurs="0">
@@ -10203,7 +10203,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATAATTACHED_G" minOccurs="0">
@@ -10211,7 +10211,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARCITY" minOccurs="0">
@@ -10219,7 +10219,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARBILAD" minOccurs="0">
@@ -10227,12 +10227,12 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATASQFT" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -10240,7 +10240,7 @@
                         </xs:element>
                         <xs:element name="DATARSQFT" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -10248,7 +10248,7 @@
                         </xs:element>
                         <xs:element name="DATARZIP" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -10259,7 +10259,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARSECLN" minOccurs="0">
@@ -10267,12 +10267,12 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATAGEOMAIN" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>
@@ -10283,7 +10283,7 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARPROCD" minOccurs="0">
@@ -10291,12 +10291,12 @@
                                 <xs:documentation>Computed Property</xs:documentation>
                             </xs:annotation>
                             <xs:simpleType>
-                                <xs:restriction base="xs:string"/>
+                                <xs:restriction base="xs:string" />
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="DATARWARD" minOccurs="0">
                             <xs:simpleType>
-                                <xs:restriction base="xs:int"/>
+                                <xs:restriction base="xs:int" />
                             </xs:simpleType>
                             <xs:annotation>
                                 <xs:documentation>Computed Property</xs:documentation>

Modified: trunk/Tools/Maestro/MaestroAPITests/Resources/SelectFeatureSample.xml
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/Resources/SelectFeatureSample.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/Resources/SelectFeatureSample.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -2,51 +2,51 @@
 <FeatureSet>
     <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://fdo.osgeo.org/schemas/feature/Schema1" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:gml="http://www.opengis.net/gml" xmlns:Schema1="http://fdo.osgeo.org/schemas/feature/Schema1" elementFormDefault="qualified" attributeFormDefault="unqualified">
         <xs:annotation>
-            <xs:documentation/>
-            <xs:appinfo source="http://fdo.osgeo.org/schemas"/>
+            <xs:documentation />
+            <xs:appinfo source="http://fdo.osgeo.org/schemas" />
         </xs:annotation>
         <xs:element name="Foobar" type="Schema1:FoobarType" abstract="false" substitutionGroup="gml:_Feature">
             <xs:key name="FoobarKey">
-                <xs:selector xpath=".//Foobar"/>
-                <xs:field xpath="ID"/>
+                <xs:selector xpath=".//Foobar" />
+                <xs:field xpath="ID" />
             </xs:key>
         </xs:element>
         <xs:complexType name="FoobarType" abstract="false">
             <xs:annotation>
-                <xs:documentation/>
-                <xs:appinfo source="http://fdo.osgeo.org/schemas"/>
+                <xs:documentation />
+                <xs:appinfo source="http://fdo.osgeo.org/schemas" />
             </xs:annotation>
             <xs:complexContent>
                 <xs:extension base="fdo:ClassType">
                     <xs:sequence>
                         <xs:element name="ID" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                             <xs:simpleType>
-                                <xs:restriction base="fdo:int32"/>
+                                <xs:restriction base="fdo:int32" />
                             </xs:simpleType>
                             <xs:annotation>
-                                <xs:documentation/>
-                                <xs:appinfo source="http://fdo.osgeo.org/schemas"/>
+                                <xs:documentation />
+                                <xs:appinfo source="http://fdo.osgeo.org/schemas" />
                             </xs:annotation>
                         </xs:element>
                         <xs:element name="Name" minOccurs="0">
                             <xs:annotation>
-                                <xs:documentation/>
-                                <xs:appinfo source="http://fdo.osgeo.org/schemas"/>
+                                <xs:documentation />
+                                <xs:appinfo source="http://fdo.osgeo.org/schemas" />
                             </xs:annotation>
                             <xs:simpleType>
                                 <xs:restriction base="xs:string">
-                                    <xs:maxLength value="255"/>
+                                    <xs:maxLength value="255" />
                                 </xs:restriction>
                             </xs:simpleType>
                         </xs:element>
                         <xs:element name="URL" minOccurs="0">
                             <xs:annotation>
-                                <xs:documentation/>
-                                <xs:appinfo source="http://fdo.osgeo.org/schemas"/>
+                                <xs:documentation />
+                                <xs:appinfo source="http://fdo.osgeo.org/schemas" />
                             </xs:annotation>
                             <xs:simpleType>
                                 <xs:restriction base="xs:string">
-                                    <xs:maxLength value="255"/>
+                                    <xs:maxLength value="255" />
                                 </xs:restriction>
                             </xs:simpleType>
                         </xs:element>

Modified: trunk/Tools/Maestro/MaestroAPITests/Resources/SelectSqlSample.xml
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/Resources/SelectSqlSample.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/Resources/SelectSqlSample.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -54,5 +54,5 @@
                 <Name>URL</Name>
             </Column>
         </Row>
-    </Rows>	
+    </Rows>
 </RowSet>
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/RuntimeMapTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/RuntimeMapTests.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/RuntimeMapTests.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,53 +1,54 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using NUnit.Framework;
 using OSGeo.MapGuide.MaestroAPI;
-using System.IO;
+using OSGeo.MapGuide.MaestroAPI.Mapping;
+using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels.Common;
 using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.MaestroAPI.Mapping;
-using OSGeo.MapGuide.MaestroAPI.Services;
+using System;
+using System.Collections.Generic;
+using System.IO;
 
 namespace MaestroAPITests
 {
+    using OSGeo.MapGuide.ExtendedObjectModels;
+    using OSGeo.MapGuide.MaestroAPI.Commands;
+    using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
+    using OSGeo.MapGuide.MaestroAPI.Resource;
+    using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
     using OSGeo.MapGuide.ObjectModels;
-    using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
-    using OSGeo.MapGuide.MaestroAPI.Resource;
-    using OSGeo.MapGuide.ObjectModels.LoadProcedure;
+    using OSGeo.MapGuide.ObjectModels.DrawingSource;
+    using OSGeo.MapGuide.ObjectModels.LayerDefinition;
     using System.Diagnostics;
-    using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
     using System.Drawing;
-    using OSGeo.MapGuide.ExtendedObjectModels;
-    using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-    using OSGeo.MapGuide.ObjectModels.DrawingSource;
-    using OSGeo.MapGuide.MaestroAPI.Commands;
     using MapModel = OSGeo.MapGuide.ObjectModels.RuntimeMap;
 
     [SetUpFixture]
     public class TestBootstrap
     {
         //Guard variable to prevent duplicate registration on repeated test runs of a single test session
-        static bool _registered = false;
+        private static bool _registered = false;
 
         [SetUp]
         public void Setup()
@@ -123,7 +124,6 @@
         [TestFixtureTearDown]
         public void TestFixtureTearDown()
         {
-            
         }
 
         protected abstract IServerConnection CreateTestConnection();
@@ -143,7 +143,7 @@
             Assert.NotNull(mapSvc);
 
             var map = mapSvc.CreateMap("Session:" + _conn.SessionID + "//TestGroupAssignment.Map", mdf, 1.0);
-            foreach(var grp in mdf.MapLayerGroup)
+            foreach (var grp in mdf.MapLayerGroup)
             {
                 var rtGrp = mapSvc.CreateMapGroup(map, grp);
                 Assert.AreEqual(rtGrp.Group, grp.Group);
@@ -258,7 +258,7 @@
             var map = mapSvc.CreateMap(mid, mdf, 1.0);
             //Doesn't exist yet because save isn't called
             if (CaresAboutRuntimeMapState) Assert.IsTrue(!resSvc.ResourceExists(mid));
-            
+
             //Call save
             Assert.IsTrue(Matches(map, mdf));
             Assert.IsFalse(map.IsDirty);
@@ -326,7 +326,7 @@
         {
             //Render a map of sheboygan at 75k
             //Only programmatically verify the returned stream can be fed to a
-            //System.Drawing.Image object. 
+            //System.Drawing.Image object.
 
             var resSvc = _conn.ResourceService;
             var mapSvc = _conn.GetService((int)ServiceType.Mapping) as IMappingService;
@@ -336,8 +336,8 @@
             Assert.NotNull(mdf);
 
             //FIXME: We have a problem. Can we calculate this value without MgCoordinateSystem and just using the WKT?
-            //The answer to this will answer whether we can actually support the Rendering Service API over http 
-            //using pure client-side runtime maps 
+            //The answer to this will answer whether we can actually support the Rendering Service API over http
+            //using pure client-side runtime maps
             //
             //The hard-coded value here was the output of MgCoordinateSystem.ConvertCoordinateSystemUnitsToMeters(1.0)
             //for this particular map.
@@ -548,7 +548,7 @@
             }
         }
 
-        #endregion
+        #endregion render helpers
 
         public virtual void TestLegendIconRendering()
         {
@@ -560,8 +560,8 @@
             Assert.NotNull(mdf);
 
             //FIXME: We have a problem. Can we calculate this value without MgCoordinateSystem and just using the WKT?
-            //The answer to this will answer whether we can actually support the Rendering Service API over http 
-            //using pure client-side runtime maps 
+            //The answer to this will answer whether we can actually support the Rendering Service API over http
+            //using pure client-side runtime maps
             //
             //The hard-coded value here was the output of MgCoordinateSystem.ConvertCoordinateSystemUnitsToMeters(1.0)
             //for this particular map.
@@ -614,10 +614,10 @@
         }
 
         public virtual void TestRender12k()
-        { 
+        {
             //Render a map of sheboygan at 12k
             //Only programmatically verify the returned stream can be fed to a
-            //System.Drawing.Image object. 
+            //System.Drawing.Image object.
 
             var resSvc = _conn.ResourceService;
             var mapSvc = _conn.GetService((int)ServiceType.Mapping) as IMappingService;
@@ -627,8 +627,8 @@
             Assert.NotNull(mdf);
 
             //FIXME: We have a problem. Can we calculate this value without MgCoordinateSystem and just using the WKT?
-            //The answer to this will answer whether we can actually support the Rendering Service API over http 
-            //using pure client-side runtime maps 
+            //The answer to this will answer whether we can actually support the Rendering Service API over http
+            //using pure client-side runtime maps
             //
             //The hard-coded value here was the output of MgCoordinateSystem.ConvertCoordinateSystemUnitsToMeters(1.0)
             //for this particular map.
@@ -664,7 +664,7 @@
             Assert.IsTrue(map.IsDirty);
             map.Save();
             Assert.IsFalse(map.IsDirty);
-            
+
             //Render again
             RenderAndVerify(mapSvc, map, TestPrefix + "TestRender12k_NoParcels.png", "PNG");
             RenderAndVerifyConvenience(map, TestPrefix + "TestRender12kConvenience_NoParcels.png", "PNG");
@@ -700,8 +700,8 @@
             Assert.NotNull(mdf);
 
             //FIXME: We have a problem. Can we calculate this value without MgCoordinateSystem and just using the WKT?
-            //The answer to this will answer whether we can actually support the Rendering Service API over http 
-            //using pure client-side runtime maps 
+            //The answer to this will answer whether we can actually support the Rendering Service API over http
+            //using pure client-side runtime maps
             //
             //The hard-coded value here was the output of MgCoordinateSystem.ConvertCoordinateSystemUnitsToMeters(1.0)
             //for this particular map.
@@ -793,8 +793,8 @@
             Assert.NotNull(mdf);
 
             //FIXME: We have a problem. Can we calculate this value without MgCoordinateSystem and just using the WKT?
-            //The answer to this will answer whether we can actually support the Rendering Service API over http 
-            //using pure client-side runtime maps 
+            //The answer to this will answer whether we can actually support the Rendering Service API over http
+            //using pure client-side runtime maps
             //
             //The hard-coded value here was the output of MgCoordinateSystem.ConvertCoordinateSystemUnitsToMeters(1.0)
             //for this particular map.
@@ -922,8 +922,8 @@
             Assert.NotNull(mdf);
 
             //FIXME: We have a problem. Can we calculate this value without MgCoordinateSystem and just using the WKT?
-            //The answer to this will answer whether we can actually support the Rendering Service API over http 
-            //using pure client-side runtime maps 
+            //The answer to this will answer whether we can actually support the Rendering Service API over http
+            //using pure client-side runtime maps
             //
             //The hard-coded value here was the output of MgCoordinateSystem.ConvertCoordinateSystemUnitsToMeters(1.0)
             //for this particular map.
@@ -1056,7 +1056,7 @@
             tmprtm.Save();
             Assert.IsFalse(tmprtm.IsDirty);
 
-            RuntimeMap mymap = mapSvc.OpenMap(mapid); 
+            RuntimeMap mymap = mapSvc.OpenMap(mapid);
         }
 
         public virtual void TestMapManipulation5()
@@ -1240,7 +1240,7 @@
         {
             base.TestExtentSerialization();
         }
-        
+
         [Test]
         public override void TestResourceEvents()
         {
@@ -1300,7 +1300,7 @@
         {
             base.TestLargeMapCreatePerformance();
         }
-        
+
         [Test]
         public override void TestMapManipulation4()
         {
@@ -1349,7 +1349,7 @@
             Assert.True(rtInfo.Layers.Count == 0);
             Assert.NotNull(rtInfo.Groups);
             Assert.True(rtInfo.Groups.Count == 0);
-            
+
             //Barebones with tiled
             create = (ICreateRuntimeMap)_conn.CreateCommand((int)CommandType.CreateRuntimeMap);
             create.MapDefinition = "Library://UnitTests/Maps/SheboyganTiled.MapDefinition";
@@ -1568,7 +1568,7 @@
             //Kitchen sink
             create = (ICreateRuntimeMap)_conn.CreateCommand((int)CommandType.CreateRuntimeMap);
             create.MapDefinition = "Library://UnitTests/Maps/Sheboygan.MapDefinition";
-            
+
             map = create.Execute();
             describe = (IDescribeRuntimeMap)_conn.CreateCommand((int)CommandType.DescribeRuntimeMap);
             describe.Name = map.Name;
@@ -1769,13 +1769,13 @@
         {
             base.TestCreate();
         }
-        
+
         [Test]
         public override void TestSave()
         {
             base.TestSave();
         }
-        
+
         [Test]
         public override void TestRender75k()
         {
@@ -1825,4 +1825,4 @@
             base.TestLargeMapCreatePerformance();
         }*/
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/SchemaTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/SchemaTests.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/SchemaTests.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using NUnit.Framework;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Schema;
+using System;
 using System.IO;
 using System.Xml;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace MaestroAPITests
 {
@@ -39,7 +40,7 @@
         }
 
         //These tests are to verify that we can read FDO XML configuration and schema documents without problems
-        
+
         [Test]
         public void TestMySqlSchema()
         {
@@ -154,7 +155,7 @@
             Assert.IsTrue(prop.IsAutoGenerated);
             Assert.IsFalse(prop.IsReadOnly);
             Assert.IsFalse(prop.IsNullable);
-           
+
             cls.AddProperty(new DataPropertyDefinition("Name", "The name")
             {
                 DataType = DataPropertyType.String,
@@ -201,7 +202,7 @@
 
             schema = fsd.Schemas[0];
             Assert.NotNull(schema);
-            
+
             cls = schema.GetClass("Class1");
             Assert.NotNull(cls);
 
@@ -214,7 +215,6 @@
             Assert.IsTrue(prop.IsAutoGenerated);
             Assert.IsFalse(prop.IsReadOnly);
             Assert.IsFalse(prop.IsNullable);
-           
 
             prop = cls.FindProperty("Name") as DataPropertyDefinition;
 
@@ -315,110 +315,110 @@
             schema.AddClass(cls);
             Assert.AreEqual(schema, cls.Parent);
         }
-        
+
         [Test]
         public void TestClassNameEncoding()
         {
             // Round-trip various invalid XML names. Copied from FDO test suite
             string name1 = "Abc def";
             string name2 = Utility.EncodeFDOName(name1);
-            Assert.AreEqual( name2, "Abc-x20-def" );
-            Assert.AreEqual( name1, Utility.DecodeFDOName(name2) );
- 
+            Assert.AreEqual(name2, "Abc-x20-def");
+            Assert.AreEqual(name1, Utility.DecodeFDOName(name2));
+
             name1 = " Abc#defg$$";
             name2 = Utility.EncodeFDOName(name1);
-            Assert.AreEqual( name2, "_x20-Abc-x23-defg-x24--x24-" );
-            Assert.AreEqual( name1, Utility.DecodeFDOName(name2) );
-        
+            Assert.AreEqual(name2, "_x20-Abc-x23-defg-x24--x24-");
+            Assert.AreEqual(name1, Utility.DecodeFDOName(name2));
+
             name1 = " Abc#defg hij";
             name2 = Utility.EncodeFDOName(name1);
-            Assert.AreEqual( name2, "_x20-Abc-x23-defg-x20-hij" );
-            Assert.AreEqual( name1, Utility.DecodeFDOName(name2) );
-        
+            Assert.AreEqual(name2, "_x20-Abc-x23-defg-x20-hij");
+            Assert.AreEqual(name1, Utility.DecodeFDOName(name2));
+
             name1 = "--abc-def---ghi--";
             name2 = Utility.EncodeFDOName(name1);
-            Assert.AreEqual( name2, "_x2d--abc-def---ghi--" );
-            Assert.AreEqual( name1, Utility.DecodeFDOName(name2) );
-        
+            Assert.AreEqual(name2, "_x2d--abc-def---ghi--");
+            Assert.AreEqual(name1, Utility.DecodeFDOName(name2));
+
             name1 = "--abc-x20-def-x23--x24-ghi--";
             name2 = Utility.EncodeFDOName(name1);
-            Assert.AreEqual( name2, "_x2d--abc-x2d-x20-def-x2d-x23--x2d-x24-ghi--" );
-            Assert.AreEqual( name1, Utility.DecodeFDOName(name2) );
+            Assert.AreEqual(name2, "_x2d--abc-x2d-x20-def-x2d-x23--x2d-x24-ghi--");
+            Assert.AreEqual(name1, Utility.DecodeFDOName(name2));
 
             name1 = "-xab";
             name2 = Utility.EncodeFDOName(name1);
-            Assert.AreEqual( name2, "_x2d-xab" );
-            Assert.AreEqual( name1, Utility.DecodeFDOName(name2) );
+            Assert.AreEqual(name2, "_x2d-xab");
+            Assert.AreEqual(name1, Utility.DecodeFDOName(name2));
 
             name1 = "&Entity";
             name2 = Utility.EncodeFDOName(name1);
-            Assert.AreEqual( name2, "_x26-Entity" );
-            Assert.AreEqual( name1, Utility.DecodeFDOName(name2) );
+            Assert.AreEqual(name2, "_x26-Entity");
+            Assert.AreEqual(name1, Utility.DecodeFDOName(name2));
 
             name1 = "11ab";
             name2 = Utility.EncodeFDOName(name1);
-            Assert.AreEqual( name2, "_x31-1ab" );
-            Assert.AreEqual( name1, Utility.DecodeFDOName(name2) );
+            Assert.AreEqual(name2, "_x31-1ab");
+            Assert.AreEqual(name1, Utility.DecodeFDOName(name2));
 
             name1 = "2_Class";
             name2 = Utility.EncodeFDOName(name1);
-            Assert.AreEqual( name2, "_x32-_Class" );
-            Assert.AreEqual( name1, Utility.DecodeFDOName(name2) );
+            Assert.AreEqual(name2, "_x32-_Class");
+            Assert.AreEqual(name1, Utility.DecodeFDOName(name2));
 
             name1 = "2%Class";
             name2 = Utility.EncodeFDOName(name1);
-            Assert.AreEqual( name2, "_x32--x25-Class" );
-            Assert.AreEqual( name1, Utility.DecodeFDOName(name2) );
+            Assert.AreEqual(name2, "_x32--x25-Class");
+            Assert.AreEqual(name1, Utility.DecodeFDOName(name2));
 
             name1 = "2-Class";
             name2 = Utility.EncodeFDOName(name1);
-            Assert.AreEqual( name2, "_x32--Class" );
-            Assert.AreEqual( name1, Utility.DecodeFDOName(name2) );
+            Assert.AreEqual(name2, "_x32--Class");
+            Assert.AreEqual(name1, Utility.DecodeFDOName(name2));
 
             name1 = "2-x2f-Class";
             name2 = Utility.EncodeFDOName(name1);
-            Assert.AreEqual( name2, "_x32--x2d-x2f-Class" );
-            Assert.AreEqual( name1, Utility.DecodeFDOName(name2) );
+            Assert.AreEqual(name2, "_x32--x2d-x2f-Class");
+            Assert.AreEqual(name1, Utility.DecodeFDOName(name2));
 
             name1 = "_x2d-";
             name2 = Utility.EncodeFDOName(name1);
-            Assert.AreEqual( name2, "_x00-_x2d-" );
-            Assert.AreEqual( name1, Utility.DecodeFDOName(name2) );
+            Assert.AreEqual(name2, "_x00-_x2d-");
+            Assert.AreEqual(name1, Utility.DecodeFDOName(name2));
 
             name1 = "-x3d-";
             name2 = Utility.EncodeFDOName(name1);
-            Assert.AreEqual( name2, "_x2d-x3d-" );
-            Assert.AreEqual( name1, Utility.DecodeFDOName(name2) );
+            Assert.AreEqual(name2, "_x2d-x3d-");
+            Assert.AreEqual(name1, Utility.DecodeFDOName(name2));
 
             name1 = "_x2d-_x3f-";
             name2 = Utility.EncodeFDOName(name1);
-            Assert.AreEqual( name2, "_x00-_x2d-_x3f-" );
-            Assert.AreEqual( name1, Utility.DecodeFDOName(name2) );
+            Assert.AreEqual(name2, "_x00-_x2d-_x3f-");
+            Assert.AreEqual(name1, Utility.DecodeFDOName(name2));
 
             name1 = "__x2d-_x3f-";
             name2 = Utility.EncodeFDOName(name1);
-            Assert.AreEqual( name2, "__x2d-_x3f-" );
-            Assert.AreEqual( name1, Utility.DecodeFDOName(name2) );
+            Assert.AreEqual(name2, "__x2d-_x3f-");
+            Assert.AreEqual(name1, Utility.DecodeFDOName(name2));
 
             name1 = "_Class";
             name2 = Utility.EncodeFDOName(name1);
-            Assert.AreEqual( name2, "_Class" );
-            Assert.AreEqual( name1, Utility.DecodeFDOName(name2) );
+            Assert.AreEqual(name2, "_Class");
+            Assert.AreEqual(name1, Utility.DecodeFDOName(name2));
 
             name1 = "_5Class";
             name2 = Utility.EncodeFDOName(name1);
-            Assert.AreEqual( name2, "_5Class" );
-            Assert.AreEqual( name1, Utility.DecodeFDOName(name2) );
+            Assert.AreEqual(name2, "_5Class");
+            Assert.AreEqual(name1, Utility.DecodeFDOName(name2));
 
             name1 = "_-5Class";
             name2 = Utility.EncodeFDOName(name1);
-            Assert.AreEqual( name2, "_-5Class" );
-            Assert.AreEqual( name1, Utility.DecodeFDOName(name2) );
+            Assert.AreEqual(name2, "_-5Class");
+            Assert.AreEqual(name1, Utility.DecodeFDOName(name2));
 
             name1 = "-_x2f-Class";
             name2 = Utility.EncodeFDOName(name1);
-            Assert.AreEqual( name2, "_x2d-_x2f-Class" );
-            Assert.AreEqual( name1, Utility.DecodeFDOName(name2) );
+            Assert.AreEqual(name2, "_x2d-_x2f-Class");
+            Assert.AreEqual(name1, Utility.DecodeFDOName(name2));
 
             name1 = "Foo/Bar - snafu";
             name2 = Utility.EncodeFDOName(name1);
@@ -427,7 +427,7 @@
 
             // Backward compatibility check. Make sure old-style 1st character encodings get decoded.
             name2 = "-x40-A";
-            Assert.AreEqual( Utility.DecodeFDOName(name2), "@A" );
+            Assert.AreEqual(Utility.DecodeFDOName(name2), "@A");
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/SerializationTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/SerializationTests.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/SerializationTests.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using NUnit.Framework;
-using OSGeo.MapGuide.ObjectModels;
-using NMock2;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace MaestroAPITests
 {
@@ -52,4 +49,4 @@
             //version numbers of resource content streams
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/TestControl.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/TestControl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/TestControl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI;
 using System.IO;
 using System.Xml;
 
@@ -183,4 +184,4 @@
                 "Password", TestEnvironment.HttpPassword);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/UserTestData/1896.xml
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/UserTestData/1896.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/UserTestData/1896.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -2,8 +2,8 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://fdo.osgeo.org/schemas/feature/OGRSchema" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:gml="http://www.opengis.net/gml" xmlns:OGRSchema="http://fdo.osgeo.org/schemas/feature/OGRSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:element name="catasto-x7e-fabbricati" type="OGRSchema:catasto-x7e-fabbricatiType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="catasto-x7e-fabbricatiKey">
-            <xs:selector xpath=".//catasto-x7e-fabbricati"/>
-            <xs:field xpath="ogc_fid"/>
+            <xs:selector xpath=".//catasto-x7e-fabbricati" />
+            <xs:field xpath="ogc_fid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="catasto-x7e-fabbricatiType" abstract="false" fdo:geometryName="the_geom">
@@ -13,69 +13,69 @@
                     <xs:element name="allegato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="comune" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="foglio" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="gid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="particella" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="5"/>
+                                <xs:maxLength value="5" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="recno" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sezione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sviluppo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="x_coord" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="y_coord" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~fabbricati" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~fabbricati" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="ogc_fid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -84,8 +84,8 @@
     </xs:complexType>
     <xs:element name="catasto-x7e-fabbricati_geometriaerrata" type="OGRSchema:catasto-x7e-fabbricati_geometriaerrataType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="catasto-x7e-fabbricati_geometriaerrataKey">
-            <xs:selector xpath=".//catasto-x7e-fabbricati_geometriaerrata"/>
-            <xs:field xpath="ogc_fid"/>
+            <xs:selector xpath=".//catasto-x7e-fabbricati_geometriaerrata" />
+            <xs:field xpath="ogc_fid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="catasto-x7e-fabbricati_geometriaerrataType" abstract="false" fdo:geometryName="the_geom">
@@ -95,69 +95,69 @@
                     <xs:element name="allegato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="comune" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="foglio" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="gid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="particella" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="5"/>
+                                <xs:maxLength value="5" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="recno" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sezione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sviluppo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="x_coord" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="y_coord" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~fabbricati_geometriaerrata" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~fabbricati_geometriaerrata" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="ogc_fid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -166,8 +166,8 @@
     </xs:complexType>
     <xs:element name="catasto-x7e-particelle" type="OGRSchema:catasto-x7e-particelleType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="catasto-x7e-particelleKey">
-            <xs:selector xpath=".//catasto-x7e-particelle"/>
-            <xs:field xpath="gid"/>
+            <xs:selector xpath=".//catasto-x7e-particelle" />
+            <xs:field xpath="gid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="catasto-x7e-particelleType" abstract="false" fdo:geometryName="the_geom">
@@ -177,76 +177,76 @@
                     <xs:element name="allegato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="comune" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="foglio" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="livello" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="10"/>
+                                <xs:maxLength value="10" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="ogc_fid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="particella" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="5"/>
+                                <xs:maxLength value="5" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="recno" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sezione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sviluppo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="x_coord" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="y_coord" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~particelle" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~particelle" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="gid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -255,8 +255,8 @@
     </xs:complexType>
     <xs:element name="catasto-x7e-fiduciali" type="OGRSchema:catasto-x7e-fiducialiType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="catasto-x7e-fiducialiKey">
-            <xs:selector xpath=".//catasto-x7e-fiduciali"/>
-            <xs:field xpath="FID"/>
+            <xs:selector xpath=".//catasto-x7e-fiduciali" />
+            <xs:field xpath="FID" />
         </xs:key>
     </xs:element>
     <xs:complexType name="catasto-x7e-fiducialiType" abstract="false" fdo:geometryName="the_geom">
@@ -266,62 +266,62 @@
                     <xs:element name="allegato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="codice" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="comune" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="foglio" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="gid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="prog" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="recno" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sezione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sviluppo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~fiduciali" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~fiduciali" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="FID" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -330,8 +330,8 @@
     </xs:complexType>
     <xs:element name="catasto-x7e-linee" type="OGRSchema:catasto-x7e-lineeType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="catasto-x7e-lineeKey">
-            <xs:selector xpath=".//catasto-x7e-linee"/>
-            <xs:field xpath="FID"/>
+            <xs:selector xpath=".//catasto-x7e-linee" />
+            <xs:field xpath="FID" />
         </xs:key>
     </xs:element>
     <xs:complexType name="catasto-x7e-lineeType" abstract="false" fdo:geometryName="the_geom">
@@ -341,57 +341,57 @@
                     <xs:element name="allegato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="codice" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="comune" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="foglio" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="gid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="recno" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sezione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sviluppo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~linee" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~linee" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring " />
                     <xs:element name="FID" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -400,8 +400,8 @@
     </xs:complexType>
     <xs:element name="catasto-x7e-particelle_geometriaerrata" type="OGRSchema:catasto-x7e-particelle_geometriaerrataType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="catasto-x7e-particelle_geometriaerrataKey">
-            <xs:selector xpath=".//catasto-x7e-particelle_geometriaerrata"/>
-            <xs:field xpath="ogc_fid"/>
+            <xs:selector xpath=".//catasto-x7e-particelle_geometriaerrata" />
+            <xs:field xpath="ogc_fid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="catasto-x7e-particelle_geometriaerrataType" abstract="false" fdo:geometryName="the_geom">
@@ -411,76 +411,76 @@
                     <xs:element name="allegato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="comune" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="foglio" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="gid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="livello" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="10"/>
+                                <xs:maxLength value="10" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="particella" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="5"/>
+                                <xs:maxLength value="5" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="recno" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sezione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sviluppo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="x_coord" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="y_coord" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~particelle_geometriaerrata" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~particelle_geometriaerrata" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="ogc_fid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -489,8 +489,8 @@
     </xs:complexType>
     <xs:element name="catasto-x7e-quadro_unione" type="OGRSchema:catasto-x7e-quadro_unioneType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="catasto-x7e-quadro_unioneKey">
-            <xs:selector xpath=".//catasto-x7e-quadro_unione"/>
-            <xs:field xpath="ogc_fid"/>
+            <xs:selector xpath=".//catasto-x7e-quadro_unione" />
+            <xs:field xpath="ogc_fid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="catasto-x7e-quadro_unioneType" abstract="false" fdo:geometryName="the_geom">
@@ -500,52 +500,52 @@
                     <xs:element name="allegato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="comune" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="foglio" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="gid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="recno" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sezione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sviluppo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~quadro_unione" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~quadro_unione" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="ogc_fid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -554,8 +554,8 @@
     </xs:complexType>
     <xs:element name="catasto-x7e-simboli" type="OGRSchema:catasto-x7e-simboliType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="catasto-x7e-simboliKey">
-            <xs:selector xpath=".//catasto-x7e-simboli"/>
-            <xs:field xpath="FID"/>
+            <xs:selector xpath=".//catasto-x7e-simboli" />
+            <xs:field xpath="FID" />
         </xs:key>
     </xs:element>
     <xs:complexType name="catasto-x7e-simboliType" abstract="false" fdo:geometryName="the_geom">
@@ -565,72 +565,72 @@
                     <xs:element name="allegato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="codice" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="comune" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="foglio" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="gid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="recno" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sezione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sviluppo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="x_coord" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="y_coord" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~simboli" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~simboli" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="FID" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -639,8 +639,8 @@
     </xs:complexType>
     <xs:element name="catasto-x7e-storico_fabbricati" type="OGRSchema:catasto-x7e-storico_fabbricatiType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="catasto-x7e-storico_fabbricatiKey">
-            <xs:selector xpath=".//catasto-x7e-storico_fabbricati"/>
-            <xs:field xpath="FID"/>
+            <xs:selector xpath=".//catasto-x7e-storico_fabbricati" />
+            <xs:field xpath="FID" />
         </xs:key>
     </xs:element>
     <xs:complexType name="catasto-x7e-storico_fabbricatiType" abstract="false" fdo:geometryName="the_geom">
@@ -650,66 +650,66 @@
                     <xs:element name="allegato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="comune" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="data_sostituzione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="10"/>
+                                <xs:maxLength value="10" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="foglio" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="gid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="particella" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="5"/>
+                                <xs:maxLength value="5" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="recno" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sezione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sviluppo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~storico_fabbricati" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~storico_fabbricati" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="FID" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -718,8 +718,8 @@
     </xs:complexType>
     <xs:element name="catasto-x7e-storico_particelle" type="OGRSchema:catasto-x7e-storico_particelleType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="catasto-x7e-storico_particelleKey">
-            <xs:selector xpath=".//catasto-x7e-storico_particelle"/>
-            <xs:field xpath="FID"/>
+            <xs:selector xpath=".//catasto-x7e-storico_particelle" />
+            <xs:field xpath="FID" />
         </xs:key>
     </xs:element>
     <xs:complexType name="catasto-x7e-storico_particelleType" abstract="false" fdo:geometryName="the_geom">
@@ -729,78 +729,78 @@
                     <xs:element name="allegato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="comune" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="data_sostituzione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="10"/>
+                                <xs:maxLength value="10" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="foglio" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="gid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="livello" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="10"/>
+                                <xs:maxLength value="10" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="particella" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="5"/>
+                                <xs:maxLength value="5" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="recno" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sezione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sostituita_da" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sviluppo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~storico_particelle" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~storico_particelle" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="FID" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -809,8 +809,8 @@
     </xs:complexType>
     <xs:element name="catasto-x7e-testi" type="OGRSchema:catasto-x7e-testiType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="catasto-x7e-testiKey">
-            <xs:selector xpath=".//catasto-x7e-testi"/>
-            <xs:field xpath="FID"/>
+            <xs:selector xpath=".//catasto-x7e-testi" />
+            <xs:field xpath="FID" />
         </xs:key>
     </xs:element>
     <xs:complexType name="catasto-x7e-testiType" abstract="false" fdo:geometryName="the_geom">
@@ -820,79 +820,79 @@
                     <xs:element name="allegato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="altezza" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="comune" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="foglio" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="gid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="recno" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sezione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sviluppo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="testo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="50"/>
+                                <xs:maxLength value="50" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="x_coord" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="y_coord" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~testi" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~testi" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="FID" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -901,8 +901,8 @@
     </xs:complexType>
     <xs:element name="catasto-x7e-upload_fabbricati" type="OGRSchema:catasto-x7e-upload_fabbricatiType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="catasto-x7e-upload_fabbricatiKey">
-            <xs:selector xpath=".//catasto-x7e-upload_fabbricati"/>
-            <xs:field xpath="FID"/>
+            <xs:selector xpath=".//catasto-x7e-upload_fabbricati" />
+            <xs:field xpath="FID" />
         </xs:key>
     </xs:element>
     <xs:complexType name="catasto-x7e-upload_fabbricatiType" abstract="false" fdo:geometryName="the_geom">
@@ -912,54 +912,54 @@
                     <xs:element name="allegato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="comune" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="foglio" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="gid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="particella" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="5"/>
+                                <xs:maxLength value="5" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sezione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sviluppo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~upload_fabbricati" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~upload_fabbricati" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="FID" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -968,8 +968,8 @@
     </xs:complexType>
     <xs:element name="catasto-x7e-upload_fiduciali" type="OGRSchema:catasto-x7e-upload_fiducialiType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="catasto-x7e-upload_fiducialiKey">
-            <xs:selector xpath=".//catasto-x7e-upload_fiduciali"/>
-            <xs:field xpath="FID"/>
+            <xs:selector xpath=".//catasto-x7e-upload_fiduciali" />
+            <xs:field xpath="FID" />
         </xs:key>
     </xs:element>
     <xs:complexType name="catasto-x7e-upload_fiducialiType" abstract="false" fdo:geometryName="the_geom">
@@ -979,57 +979,57 @@
                     <xs:element name="allegato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="codice" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="comune" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="foglio" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="gid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="prog" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sezione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sviluppo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~upload_fiduciali" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~upload_fiduciali" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="FID" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -1038,8 +1038,8 @@
     </xs:complexType>
     <xs:element name="catasto-x7e-upload_linee" type="OGRSchema:catasto-x7e-upload_lineeType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="catasto-x7e-upload_lineeKey">
-            <xs:selector xpath=".//catasto-x7e-upload_linee"/>
-            <xs:field xpath="FID"/>
+            <xs:selector xpath=".//catasto-x7e-upload_linee" />
+            <xs:field xpath="FID" />
         </xs:key>
     </xs:element>
     <xs:complexType name="catasto-x7e-upload_lineeType" abstract="false" fdo:geometryName="the_geom">
@@ -1049,52 +1049,52 @@
                     <xs:element name="allegato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="codice" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="comune" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="foglio" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="gid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sezione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sviluppo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~upload_linee" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~upload_linee" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring " />
                     <xs:element name="FID" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -1103,8 +1103,8 @@
     </xs:complexType>
     <xs:element name="catasto-x7e-upload_particelle" type="OGRSchema:catasto-x7e-upload_particelleType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="catasto-x7e-upload_particelleKey">
-            <xs:selector xpath=".//catasto-x7e-upload_particelle"/>
-            <xs:field xpath="FID"/>
+            <xs:selector xpath=".//catasto-x7e-upload_particelle" />
+            <xs:field xpath="FID" />
         </xs:key>
     </xs:element>
     <xs:complexType name="catasto-x7e-upload_particelleType" abstract="false" fdo:geometryName="the_geom">
@@ -1114,61 +1114,61 @@
                     <xs:element name="allegato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="comune" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="foglio" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="gid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="livello" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="10"/>
+                                <xs:maxLength value="10" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="particella" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="5"/>
+                                <xs:maxLength value="5" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sezione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sviluppo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~upload_particelle" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~upload_particelle" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="FID" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -1177,8 +1177,8 @@
     </xs:complexType>
     <xs:element name="catasto-x7e-upload_simboli" type="OGRSchema:catasto-x7e-upload_simboliType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="catasto-x7e-upload_simboliKey">
-            <xs:selector xpath=".//catasto-x7e-upload_simboli"/>
-            <xs:field xpath="FID"/>
+            <xs:selector xpath=".//catasto-x7e-upload_simboli" />
+            <xs:field xpath="FID" />
         </xs:key>
     </xs:element>
     <xs:complexType name="catasto-x7e-upload_simboliType" abstract="false" fdo:geometryName="the_geom">
@@ -1188,57 +1188,57 @@
                     <xs:element name="allegato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="codice" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="comune" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="foglio" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="gid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sezione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sviluppo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~upload_simboli" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~upload_simboli" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="FID" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -1247,8 +1247,8 @@
     </xs:complexType>
     <xs:element name="catasto-x7e-upload_testi" type="OGRSchema:catasto-x7e-upload_testiType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="catasto-x7e-upload_testiKey">
-            <xs:selector xpath=".//catasto-x7e-upload_testi"/>
-            <xs:field xpath="FID"/>
+            <xs:selector xpath=".//catasto-x7e-upload_testi" />
+            <xs:field xpath="FID" />
         </xs:key>
     </xs:element>
     <xs:complexType name="catasto-x7e-upload_testiType" abstract="false" fdo:geometryName="the_geom">
@@ -1258,64 +1258,64 @@
                     <xs:element name="allegato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="altezza" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="comune" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="foglio" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="gid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sezione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sviluppo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="testo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="50"/>
+                                <xs:maxLength value="50" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~upload_testi" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~upload_testi" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="FID" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -1324,8 +1324,8 @@
     </xs:complexType>
     <xs:element name="catasto-x7e-users_wkt" type="OGRSchema:catasto-x7e-users_wktType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="catasto-x7e-users_wktKey">
-            <xs:selector xpath=".//catasto-x7e-users_wkt"/>
-            <xs:field xpath="id"/>
+            <xs:selector xpath=".//catasto-x7e-users_wkt" />
+            <xs:field xpath="id" />
         </xs:key>
     </xs:element>
     <xs:complexType name="catasto-x7e-users_wktType" abstract="false" fdo:geometryName="the_geom">
@@ -1335,26 +1335,26 @@
                     <xs:element name="shapefile" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="ts" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:dateTime"/>
+                            <xs:restriction base="xs:dateTime" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="username" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~users_wkt" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~users_wkt" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="id" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -1363,8 +1363,8 @@
     </xs:complexType>
     <xs:element name="catasto-x7e-view_particelle" type="OGRSchema:catasto-x7e-view_particelleType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="catasto-x7e-view_particelleKey">
-            <xs:selector xpath=".//catasto-x7e-view_particelle"/>
-            <xs:field xpath="ogc_fid"/>
+            <xs:selector xpath=".//catasto-x7e-view_particelle" />
+            <xs:field xpath="ogc_fid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="catasto-x7e-view_particelleType" abstract="false" fdo:geometryName="the_geom">
@@ -1374,76 +1374,76 @@
                     <xs:element name="allegato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="comune" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="foglio" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="gid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="livello" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="10"/>
+                                <xs:maxLength value="10" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="particella" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="5"/>
+                                <xs:maxLength value="5" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="recno" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sezione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sviluppo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="x_coord" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="y_coord" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~view_particelle" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~view_particelle" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="ogc_fid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -1452,8 +1452,8 @@
     </xs:complexType>
     <xs:element name="catasto-x7e-view_particelle_acque" type="OGRSchema:catasto-x7e-view_particelle_acqueType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="catasto-x7e-view_particelle_acqueKey">
-            <xs:selector xpath=".//catasto-x7e-view_particelle_acque"/>
-            <xs:field xpath="ogc_fid"/>
+            <xs:selector xpath=".//catasto-x7e-view_particelle_acque" />
+            <xs:field xpath="ogc_fid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="catasto-x7e-view_particelle_acqueType" abstract="false" fdo:geometryName="the_geom">
@@ -1463,76 +1463,76 @@
                     <xs:element name="allegato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="comune" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="foglio" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="gid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="livello" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="10"/>
+                                <xs:maxLength value="10" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="particella" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="5"/>
+                                <xs:maxLength value="5" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="recno" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sezione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sviluppo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="x_coord" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="y_coord" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~view_particelle_acque" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~view_particelle_acque" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="ogc_fid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -1541,8 +1541,8 @@
     </xs:complexType>
     <xs:element name="catasto-x7e-view_particelle_strade" type="OGRSchema:catasto-x7e-view_particelle_stradeType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="catasto-x7e-view_particelle_stradeKey">
-            <xs:selector xpath=".//catasto-x7e-view_particelle_strade"/>
-            <xs:field xpath="ogc_fid"/>
+            <xs:selector xpath=".//catasto-x7e-view_particelle_strade" />
+            <xs:field xpath="ogc_fid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="catasto-x7e-view_particelle_stradeType" abstract="false" fdo:geometryName="the_geom">
@@ -1552,76 +1552,76 @@
                     <xs:element name="allegato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="comune" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="foglio" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="gid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="livello" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="10"/>
+                                <xs:maxLength value="10" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="particella" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="5"/>
+                                <xs:maxLength value="5" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="recno" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sezione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sviluppo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="1"/>
+                                <xs:maxLength value="1" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="x_coord" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="y_coord" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~view_particelle_strade" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="catasto~view_particelle_strade" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="ogc_fid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -1630,8 +1630,8 @@
     </xs:complexType>
     <xs:element name="civici-x7e-accessi_principali_storia" type="OGRSchema:civici-x7e-accessi_principali_storiaType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="civici-x7e-accessi_principali_storiaKey">
-            <xs:selector xpath=".//civici-x7e-accessi_principali_storia"/>
-            <xs:field xpath="FID"/>
+            <xs:selector xpath=".//civici-x7e-accessi_principali_storia" />
+            <xs:field xpath="FID" />
         </xs:key>
     </xs:element>
     <xs:complexType name="civici-x7e-accessi_principali_storiaType" abstract="false" fdo:geometryName="the_geom">
@@ -1640,146 +1640,146 @@
                 <xs:sequence>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="codice_strada" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="esponente" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_accesso" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_edf_unita_volumetrica" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_log_attivita" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_passo_carraio" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_sezione_censuaria" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="note" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="numero" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="rilievo_accesso_sequenziale" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="rilievo_numero_alloggi" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="rilievo_numero_attivita" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="targa_alto_destra" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="targa_conforme" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="targa_da_sostituire" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="targa_id" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="targa_motivo_sostituzione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="targa_tipo_targhetta" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="targa_visibile_strada" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tf" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:dateTime"/>
+                            <xs:restriction base="xs:dateTime" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~accessi_principali_storia" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~accessi_principali_storia" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="FID" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -1788,8 +1788,8 @@
     </xs:complexType>
     <xs:element name="civici-x7e-accessi_ripetuti_storia" type="OGRSchema:civici-x7e-accessi_ripetuti_storiaType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="civici-x7e-accessi_ripetuti_storiaKey">
-            <xs:selector xpath=".//civici-x7e-accessi_ripetuti_storia"/>
-            <xs:field xpath="FID"/>
+            <xs:selector xpath=".//civici-x7e-accessi_ripetuti_storia" />
+            <xs:field xpath="FID" />
         </xs:key>
     </xs:element>
     <xs:complexType name="civici-x7e-accessi_ripetuti_storiaType" abstract="false" fdo:geometryName="the_geom">
@@ -1798,101 +1798,101 @@
                 <xs:sequence>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="dismesso" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_accessi_principali" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_accesso" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_log_attivita" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_passo_carraio" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="note" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="targa_alto_destra" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="targa_conforme" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="targa_da_sostituire" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="targa_id" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="targa_motivo_sostituzione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="targa_tipo_targhetta" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="targa_visibile_strada" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tf" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:dateTime"/>
+                            <xs:restriction base="xs:dateTime" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~accessi_ripetuti_storia" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~accessi_ripetuti_storia" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="FID" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -1901,8 +1901,8 @@
     </xs:complexType>
     <xs:element name="civici-x7e-civici_imported" type="OGRSchema:civici-x7e-civici_importedType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="civici-x7e-civici_importedKey">
-            <xs:selector xpath=".//civici-x7e-civici_imported"/>
-            <xs:field xpath="gid"/>
+            <xs:selector xpath=".//civici-x7e-civici_imported" />
+            <xs:field xpath="gid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="civici-x7e-civici_importedType" abstract="false" fdo:geometryName="the_geom">
@@ -1912,97 +1912,97 @@
                     <xs:element name="annotazion" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="80"/>
+                                <xs:maxLength value="80" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="civ_targ" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="civico" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="codice_via" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="esp_targ" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="80"/>
+                                <xs:maxLength value="80" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="esponente" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="80"/>
+                                <xs:maxLength value="80" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="flag_sec" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="80"/>
+                                <xs:maxLength value="80" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="handle" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="80"/>
+                                <xs:maxLength value="80" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="idfab" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="80"/>
+                                <xs:maxLength value="80" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="layer" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="80"/>
+                                <xs:maxLength value="80" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="objectid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="posizione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="80"/>
+                                <xs:maxLength value="80" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato_civ" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="80"/>
+                                <xs:maxLength value="80" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="ubicazion" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="80"/>
+                                <xs:maxLength value="80" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~civici_imported" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~civici_imported" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="gid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -2011,8 +2011,8 @@
     </xs:complexType>
     <xs:element name="civici-x7e-view_accessi_principali" type="OGRSchema:civici-x7e-view_accessi_principaliType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="civici-x7e-view_accessi_principaliKey">
-            <xs:selector xpath=".//civici-x7e-view_accessi_principali"/>
-            <xs:field xpath="ogc_fid"/>
+            <xs:selector xpath=".//civici-x7e-view_accessi_principali" />
+            <xs:field xpath="ogc_fid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="civici-x7e-view_accessi_principaliType" abstract="false" fdo:geometryName="the_geom">
@@ -2021,131 +2021,131 @@
                 <xs:sequence>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="codice_strada" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="denominazione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="esponente" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_edf_unita_volumetrica" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_sezione_censuaria" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_targhe" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="label" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="note" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="numero" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_codice_strada" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_esponente" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_numero" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_da_murare" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato_progetto" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~view_accessi_principali" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~view_accessi_principali" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="ogc_fid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -2154,8 +2154,8 @@
     </xs:complexType>
     <xs:element name="civici-x7e-view_accessi_principali_da_murare" type="OGRSchema:civici-x7e-view_accessi_principali_da_murareType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="civici-x7e-view_accessi_principali_da_murareKey">
-            <xs:selector xpath=".//civici-x7e-view_accessi_principali_da_murare"/>
-            <xs:field xpath="ogc_fid"/>
+            <xs:selector xpath=".//civici-x7e-view_accessi_principali_da_murare" />
+            <xs:field xpath="ogc_fid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="civici-x7e-view_accessi_principali_da_murareType" abstract="false" fdo:geometryName="the_geom">
@@ -2164,131 +2164,131 @@
                 <xs:sequence>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="codice_strada" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="denominazione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="esponente" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_edf_unita_volumetrica" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_sezione_censuaria" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_targhe" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="label" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="note" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="numero" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_codice_strada" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_esponente" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_numero" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_da_murare" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato_progetto" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~view_accessi_principali_da_murare" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~view_accessi_principali_da_murare" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="ogc_fid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -2297,8 +2297,8 @@
     </xs:complexType>
     <xs:element name="civici-x7e-view_accessi_principali_progetto" type="OGRSchema:civici-x7e-view_accessi_principali_progettoType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="civici-x7e-view_accessi_principali_progettoKey">
-            <xs:selector xpath=".//civici-x7e-view_accessi_principali_progetto"/>
-            <xs:field xpath="ogc_fid"/>
+            <xs:selector xpath=".//civici-x7e-view_accessi_principali_progetto" />
+            <xs:field xpath="ogc_fid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="civici-x7e-view_accessi_principali_progettoType" abstract="false" fdo:geometryName="the_geom">
@@ -2307,145 +2307,145 @@
                 <xs:sequence>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="codice_strada" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="denominazione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="esponente" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_edf_unita_volumetrica" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_sezione_censuaria" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_targhe" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="label" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="note" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="numero" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_codice_strada" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_denominazione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_esponente" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_label" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_numero" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_da_murare" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato_progetto" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~view_accessi_principali_progetto" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~view_accessi_principali_progetto" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="ogc_fid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -2454,8 +2454,8 @@
     </xs:complexType>
     <xs:element name="civici-x7e-view_accessi_principali_pubblicati" type="OGRSchema:civici-x7e-view_accessi_principali_pubblicatiType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="civici-x7e-view_accessi_principali_pubblicatiKey">
-            <xs:selector xpath=".//civici-x7e-view_accessi_principali_pubblicati"/>
-            <xs:field xpath="ogc_fid"/>
+            <xs:selector xpath=".//civici-x7e-view_accessi_principali_pubblicati" />
+            <xs:field xpath="ogc_fid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="civici-x7e-view_accessi_principali_pubblicatiType" abstract="false" fdo:geometryName="the_geom">
@@ -2464,131 +2464,131 @@
                 <xs:sequence>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="codice_strada" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="denominazione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="esponente" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_edf_unita_volumetrica" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_sezione_censuaria" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_targhe" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="label" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="note" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="numero" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_codice_strada" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_esponente" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_numero" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_da_murare" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato_progetto" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~view_accessi_principali_pubblicati" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~view_accessi_principali_pubblicati" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="ogc_fid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -2597,8 +2597,8 @@
     </xs:complexType>
     <xs:element name="civici-x7e-view_accessi_principali_rilievo" type="OGRSchema:civici-x7e-view_accessi_principali_rilievoType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="civici-x7e-view_accessi_principali_rilievoKey">
-            <xs:selector xpath=".//civici-x7e-view_accessi_principali_rilievo"/>
-            <xs:field xpath="ogc_fid"/>
+            <xs:selector xpath=".//civici-x7e-view_accessi_principali_rilievo" />
+            <xs:field xpath="ogc_fid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="civici-x7e-view_accessi_principali_rilievoType" abstract="false" fdo:geometryName="the_geom">
@@ -2607,131 +2607,131 @@
                 <xs:sequence>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="codice_strada" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="denominazione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="esponente" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_edf_unita_volumetrica" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_sezione_censuaria" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_targhe" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="label" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="note" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="numero" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_codice_strada" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_esponente" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_numero" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_da_murare" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato_progetto" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~view_accessi_principali_rilievo" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~view_accessi_principali_rilievo" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="ogc_fid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -2740,8 +2740,8 @@
     </xs:complexType>
     <xs:element name="civici-x7e-view_accessi_ripetuti" type="OGRSchema:civici-x7e-view_accessi_ripetutiType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="civici-x7e-view_accessi_ripetutiKey">
-            <xs:selector xpath=".//civici-x7e-view_accessi_ripetuti"/>
-            <xs:field xpath="ogc_fid"/>
+            <xs:selector xpath=".//civici-x7e-view_accessi_ripetuti" />
+            <xs:field xpath="ogc_fid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="civici-x7e-view_accessi_ripetutiType" abstract="false" fdo:geometryName="the_geom">
@@ -2750,101 +2750,101 @@
                 <xs:sequence>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="denominazione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="dismesso" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="esponente" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_accessi_principali" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_targhe" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="label" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="note" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="numero" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_da_murare" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato_progetto" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~view_accessi_ripetuti" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~view_accessi_ripetuti" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="ogc_fid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -2853,8 +2853,8 @@
     </xs:complexType>
     <xs:element name="civici-x7e-view_accessi_ripetuti_da_murare" type="OGRSchema:civici-x7e-view_accessi_ripetuti_da_murareType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="civici-x7e-view_accessi_ripetuti_da_murareKey">
-            <xs:selector xpath=".//civici-x7e-view_accessi_ripetuti_da_murare"/>
-            <xs:field xpath="ogc_fid"/>
+            <xs:selector xpath=".//civici-x7e-view_accessi_ripetuti_da_murare" />
+            <xs:field xpath="ogc_fid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="civici-x7e-view_accessi_ripetuti_da_murareType" abstract="false" fdo:geometryName="the_geom">
@@ -2863,115 +2863,115 @@
                 <xs:sequence>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="denominazione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="dismesso" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="esponente" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_accessi_principali" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_targhe" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="label" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="note" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="numero" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_esponente" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_numero" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_da_murare" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato_progetto" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~view_accessi_ripetuti_da_murare" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~view_accessi_ripetuti_da_murare" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="ogc_fid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -2980,8 +2980,8 @@
     </xs:complexType>
     <xs:element name="civici-x7e-view_accessi_ripetuti_progetto" type="OGRSchema:civici-x7e-view_accessi_ripetuti_progettoType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="civici-x7e-view_accessi_ripetuti_progettoKey">
-            <xs:selector xpath=".//civici-x7e-view_accessi_ripetuti_progetto"/>
-            <xs:field xpath="ogc_fid"/>
+            <xs:selector xpath=".//civici-x7e-view_accessi_ripetuti_progetto" />
+            <xs:field xpath="ogc_fid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="civici-x7e-view_accessi_ripetuti_progettoType" abstract="false" fdo:geometryName="the_geom">
@@ -2990,115 +2990,115 @@
                 <xs:sequence>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="denominazione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="dismesso" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="esponente" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_accessi_principali" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_targhe" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="label" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="note" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="numero" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_denominazione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_label" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_da_murare" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato_progetto" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~view_accessi_ripetuti_progetto" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~view_accessi_ripetuti_progetto" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="ogc_fid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -3107,8 +3107,8 @@
     </xs:complexType>
     <xs:element name="civici-x7e-view_accessi_ripetuti_pubblicati" type="OGRSchema:civici-x7e-view_accessi_ripetuti_pubblicatiType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="civici-x7e-view_accessi_ripetuti_pubblicatiKey">
-            <xs:selector xpath=".//civici-x7e-view_accessi_ripetuti_pubblicati"/>
-            <xs:field xpath="ogc_fid"/>
+            <xs:selector xpath=".//civici-x7e-view_accessi_ripetuti_pubblicati" />
+            <xs:field xpath="ogc_fid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="civici-x7e-view_accessi_ripetuti_pubblicatiType" abstract="false" fdo:geometryName="the_geom">
@@ -3117,101 +3117,101 @@
                 <xs:sequence>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="denominazione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="dismesso" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="esponente" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_accessi_principali" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_targhe" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="label" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="note" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="numero" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_da_murare" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato_progetto" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~view_accessi_ripetuti_pubblicati" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~view_accessi_ripetuti_pubblicati" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="ogc_fid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -3220,8 +3220,8 @@
     </xs:complexType>
     <xs:element name="civici-x7e-view_accessi_ripetuti_rilievo" type="OGRSchema:civici-x7e-view_accessi_ripetuti_rilievoType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="civici-x7e-view_accessi_ripetuti_rilievoKey">
-            <xs:selector xpath=".//civici-x7e-view_accessi_ripetuti_rilievo"/>
-            <xs:field xpath="ogc_fid"/>
+            <xs:selector xpath=".//civici-x7e-view_accessi_ripetuti_rilievo" />
+            <xs:field xpath="ogc_fid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="civici-x7e-view_accessi_ripetuti_rilievoType" abstract="false" fdo:geometryName="the_geom">
@@ -3230,101 +3230,101 @@
                 <xs:sequence>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="denominazione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="dismesso" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="esponente" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_accessi_principali" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_targhe" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="label" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="note" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="numero" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_da_murare" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato_progetto" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~view_accessi_ripetuti_rilievo" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~view_accessi_ripetuti_rilievo" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="ogc_fid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -3333,18 +3333,18 @@
     </xs:complexType>
     <xs:element name="ctr-x7e-aggiornamento_speditivo_edifici" type="OGRSchema:ctr-x7e-aggiornamento_speditivo_edificiType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="ctr-x7e-aggiornamento_speditivo_edificiKey">
-            <xs:selector xpath=".//ctr-x7e-aggiornamento_speditivo_edifici"/>
-            <xs:field xpath="gid"/>
+            <xs:selector xpath=".//ctr-x7e-aggiornamento_speditivo_edifici" />
+            <xs:field xpath="gid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="ctr-x7e-aggiornamento_speditivo_edificiType" abstract="false" fdo:geometryName="the_geom">
         <xs:complexContent>
             <xs:extension base="gml:AbstractFeatureType">
                 <xs:sequence>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~aggiornamento_speditivo_edifici" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~aggiornamento_speditivo_edifici" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring " />
                     <xs:element name="gid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -3353,8 +3353,8 @@
     </xs:complexType>
     <xs:element name="ctr-x7e-archi_ferroviari" type="OGRSchema:ctr-x7e-archi_ferroviariType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="ctr-x7e-archi_ferroviariKey">
-            <xs:selector xpath=".//ctr-x7e-archi_ferroviari"/>
-            <xs:field xpath="gid"/>
+            <xs:selector xpath=".//ctr-x7e-archi_ferroviari" />
+            <xs:field xpath="gid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="ctr-x7e-archi_ferroviariType" abstract="false" fdo:geometryName="the_geom">
@@ -3364,35 +3364,35 @@
                     <xs:element name="binari" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="3"/>
+                                <xs:maxLength value="3" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="codice" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="3"/>
+                                <xs:maxLength value="3" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="topon" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="40"/>
+                                <xs:maxLength value="40" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~archi_ferroviari" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~archi_ferroviari" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring " />
                     <xs:element name="gid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -3401,8 +3401,8 @@
     </xs:complexType>
     <xs:element name="ctr-x7e-archi_idrici" type="OGRSchema:ctr-x7e-archi_idriciType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="ctr-x7e-archi_idriciKey">
-            <xs:selector xpath=".//ctr-x7e-archi_idrici"/>
-            <xs:field xpath="gid"/>
+            <xs:selector xpath=".//ctr-x7e-archi_idrici" />
+            <xs:field xpath="gid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="ctr-x7e-archi_idriciType" abstract="false" fdo:geometryName="the_geom">
@@ -3412,28 +3412,28 @@
                     <xs:element name="codice" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="3"/>
+                                <xs:maxLength value="3" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="topon" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="40"/>
+                                <xs:maxLength value="40" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~archi_idrici" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~archi_idrici" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring " />
                     <xs:element name="gid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -3442,8 +3442,8 @@
     </xs:complexType>
     <xs:element name="ctr-x7e-archi_viari" type="OGRSchema:ctr-x7e-archi_viariType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="ctr-x7e-archi_viariKey">
-            <xs:selector xpath=".//ctr-x7e-archi_viari"/>
-            <xs:field xpath="gid"/>
+            <xs:selector xpath=".//ctr-x7e-archi_viari" />
+            <xs:field xpath="gid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="ctr-x7e-archi_viariType" abstract="false" fdo:geometryName="the_geom">
@@ -3453,28 +3453,28 @@
                     <xs:element name="codice" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="4"/>
+                                <xs:maxLength value="4" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="3"/>
+                                <xs:maxLength value="3" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="topon" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="40"/>
+                                <xs:maxLength value="40" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~archi_viari" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~archi_viari" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring " />
                     <xs:element name="gid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -3483,8 +3483,8 @@
     </xs:complexType>
     <xs:element name="ctr-x7e-aree_urbane" type="OGRSchema:ctr-x7e-aree_urbaneType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="ctr-x7e-aree_urbaneKey">
-            <xs:selector xpath=".//ctr-x7e-aree_urbane"/>
-            <xs:field xpath="gid"/>
+            <xs:selector xpath=".//ctr-x7e-aree_urbane" />
+            <xs:field xpath="gid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="ctr-x7e-aree_urbaneType" abstract="false" fdo:geometryName="the_geom">
@@ -3494,21 +3494,21 @@
                     <xs:element name="codice" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="254"/>
+                                <xs:maxLength value="254" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="topon" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="254"/>
+                                <xs:maxLength value="254" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~aree_urbane" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~aree_urbane" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="gid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -3517,8 +3517,8 @@
     </xs:complexType>
     <xs:element name="ctr-x7e-elementi_lineari_10k" type="OGRSchema:ctr-x7e-elementi_lineari_10kType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="ctr-x7e-elementi_lineari_10kKey">
-            <xs:selector xpath=".//ctr-x7e-elementi_lineari_10k"/>
-            <xs:field xpath="gid"/>
+            <xs:selector xpath=".//ctr-x7e-elementi_lineari_10k" />
+            <xs:field xpath="gid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="ctr-x7e-elementi_lineari_10kType" abstract="false" fdo:geometryName="the_geom">
@@ -3528,14 +3528,14 @@
                     <xs:element name="layer" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="255"/>
+                                <xs:maxLength value="255" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~elementi_lineari_10k" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~elementi_lineari_10k" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring " />
                     <xs:element name="gid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -3544,8 +3544,8 @@
     </xs:complexType>
     <xs:element name="ctr-x7e-elementi_lineari_2k" type="OGRSchema:ctr-x7e-elementi_lineari_2kType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="ctr-x7e-elementi_lineari_2kKey">
-            <xs:selector xpath=".//ctr-x7e-elementi_lineari_2k"/>
-            <xs:field xpath="gid"/>
+            <xs:selector xpath=".//ctr-x7e-elementi_lineari_2k" />
+            <xs:field xpath="gid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="ctr-x7e-elementi_lineari_2kType" abstract="false" fdo:geometryName="the_geom">
@@ -3555,14 +3555,14 @@
                     <xs:element name="layer" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="254"/>
+                                <xs:maxLength value="254" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~elementi_lineari_2k" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~elementi_lineari_2k" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring " />
                     <xs:element name="gid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -3571,18 +3571,18 @@
     </xs:complexType>
     <xs:element name="ctr-x7e-griglia_a3_1000" type="OGRSchema:ctr-x7e-griglia_a3_1000Type" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="ctr-x7e-griglia_a3_1000Key">
-            <xs:selector xpath=".//ctr-x7e-griglia_a3_1000"/>
-            <xs:field xpath="id"/>
+            <xs:selector xpath=".//ctr-x7e-griglia_a3_1000" />
+            <xs:field xpath="id" />
         </xs:key>
     </xs:element>
     <xs:complexType name="ctr-x7e-griglia_a3_1000Type" abstract="false" fdo:geometryName="the_geom">
         <xs:complexContent>
             <xs:extension base="gml:AbstractFeatureType">
                 <xs:sequence>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~griglia_a3_1000" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~griglia_a3_1000" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="id" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -3591,8 +3591,8 @@
     </xs:complexType>
     <xs:element name="ctr-x7e-limiti_amministrativi" type="OGRSchema:ctr-x7e-limiti_amministrativiType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="ctr-x7e-limiti_amministrativiKey">
-            <xs:selector xpath=".//ctr-x7e-limiti_amministrativi"/>
-            <xs:field xpath="gid"/>
+            <xs:selector xpath=".//ctr-x7e-limiti_amministrativi" />
+            <xs:field xpath="gid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="ctr-x7e-limiti_amministrativiType" abstract="false" fdo:geometryName="the_geom">
@@ -3602,14 +3602,14 @@
                     <xs:element name="nome" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="40"/>
+                                <xs:maxLength value="40" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~limiti_amministrativi" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~limiti_amministrativi" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="gid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -3618,8 +3618,8 @@
     </xs:complexType>
     <xs:element name="ctr-x7e-limiti_amministrativi_g5" type="OGRSchema:ctr-x7e-limiti_amministrativi_g5Type" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="ctr-x7e-limiti_amministrativi_g5Key">
-            <xs:selector xpath=".//ctr-x7e-limiti_amministrativi_g5"/>
-            <xs:field xpath="FID"/>
+            <xs:selector xpath=".//ctr-x7e-limiti_amministrativi_g5" />
+            <xs:field xpath="FID" />
         </xs:key>
     </xs:element>
     <xs:complexType name="ctr-x7e-limiti_amministrativi_g5Type" abstract="false" fdo:geometryName="the_geom">
@@ -3628,20 +3628,20 @@
                 <xs:sequence>
                     <xs:element name="gid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="nome" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="40"/>
+                                <xs:maxLength value="40" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~limiti_amministrativi_g5" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~limiti_amministrativi_g5" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="FID" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -3650,8 +3650,8 @@
     </xs:complexType>
     <xs:element name="ctr-x7e-orografia_10k" type="OGRSchema:ctr-x7e-orografia_10kType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="ctr-x7e-orografia_10kKey">
-            <xs:selector xpath=".//ctr-x7e-orografia_10k"/>
-            <xs:field xpath="gid"/>
+            <xs:selector xpath=".//ctr-x7e-orografia_10k" />
+            <xs:field xpath="gid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="ctr-x7e-orografia_10kType" abstract="false" fdo:geometryName="the_geom">
@@ -3661,14 +3661,14 @@
                     <xs:element name="layer" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="255"/>
+                                <xs:maxLength value="255" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~orografia_10k" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~orografia_10k" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring " />
                     <xs:element name="gid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -3677,8 +3677,8 @@
     </xs:complexType>
     <xs:element name="ctr-x7e-orografia_2k" type="OGRSchema:ctr-x7e-orografia_2kType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="ctr-x7e-orografia_2kKey">
-            <xs:selector xpath=".//ctr-x7e-orografia_2k"/>
-            <xs:field xpath="gid"/>
+            <xs:selector xpath=".//ctr-x7e-orografia_2k" />
+            <xs:field xpath="gid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="ctr-x7e-orografia_2kType" abstract="false" fdo:geometryName="the_geom">
@@ -3688,14 +3688,14 @@
                     <xs:element name="layer" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="254"/>
+                                <xs:maxLength value="254" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~orografia_2k" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~orografia_2k" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring " />
                     <xs:element name="gid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -3704,8 +3704,8 @@
     </xs:complexType>
     <xs:element name="ctr-x7e-quote_10k" type="OGRSchema:ctr-x7e-quote_10kType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="ctr-x7e-quote_10kKey">
-            <xs:selector xpath=".//ctr-x7e-quote_10k"/>
-            <xs:field xpath="gid"/>
+            <xs:selector xpath=".//ctr-x7e-quote_10k" />
+            <xs:field xpath="gid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="ctr-x7e-quote_10kType" abstract="false" fdo:geometryName="the_geom">
@@ -3714,32 +3714,32 @@
                 <xs:sequence>
                     <xs:element name="altezza" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="layer" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="255"/>
+                                <xs:maxLength value="255" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="textstring" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="254"/>
+                                <xs:maxLength value="254" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~quote_10k" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~quote_10k" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="gid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -3748,8 +3748,8 @@
     </xs:complexType>
     <xs:element name="ctr-x7e-quote_2k" type="OGRSchema:ctr-x7e-quote_2kType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="ctr-x7e-quote_2kKey">
-            <xs:selector xpath=".//ctr-x7e-quote_2k"/>
-            <xs:field xpath="gid"/>
+            <xs:selector xpath=".//ctr-x7e-quote_2k" />
+            <xs:field xpath="gid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="ctr-x7e-quote_2kType" abstract="false" fdo:geometryName="the_geom">
@@ -3758,32 +3758,32 @@
                 <xs:sequence>
                     <xs:element name="altezza" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="layer" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="255"/>
+                                <xs:maxLength value="255" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="textstring" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="254"/>
+                                <xs:maxLength value="254" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~quote_2k" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~quote_2k" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="gid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -3792,8 +3792,8 @@
     </xs:complexType>
     <xs:element name="ctr-x7e-toponimi_10k" type="OGRSchema:ctr-x7e-toponimi_10kType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="ctr-x7e-toponimi_10kKey">
-            <xs:selector xpath=".//ctr-x7e-toponimi_10k"/>
-            <xs:field xpath="gid"/>
+            <xs:selector xpath=".//ctr-x7e-toponimi_10k" />
+            <xs:field xpath="gid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="ctr-x7e-toponimi_10kType" abstract="false" fdo:geometryName="the_geom">
@@ -3802,32 +3802,32 @@
                 <xs:sequence>
                     <xs:element name="altezza" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="layer" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="255"/>
+                                <xs:maxLength value="255" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="textstring" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="254"/>
+                                <xs:maxLength value="254" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~toponimi_10k" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~toponimi_10k" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="gid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -3836,8 +3836,8 @@
     </xs:complexType>
     <xs:element name="ctr-x7e-toponimi_2k" type="OGRSchema:ctr-x7e-toponimi_2kType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="ctr-x7e-toponimi_2kKey">
-            <xs:selector xpath=".//ctr-x7e-toponimi_2k"/>
-            <xs:field xpath="gid"/>
+            <xs:selector xpath=".//ctr-x7e-toponimi_2k" />
+            <xs:field xpath="gid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="ctr-x7e-toponimi_2kType" abstract="false" fdo:geometryName="the_geom">
@@ -3846,32 +3846,32 @@
                 <xs:sequence>
                     <xs:element name="altezza" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="layer" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="254"/>
+                                <xs:maxLength value="254" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="textstring" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="254"/>
+                                <xs:maxLength value="254" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~toponimi_2k" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="ctr~toponimi_2k" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="gid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -3880,8 +3880,8 @@
     </xs:complexType>
     <xs:element name="prg-x7e-griglia" type="OGRSchema:prg-x7e-grigliaType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="prg-x7e-grigliaKey">
-            <xs:selector xpath=".//prg-x7e-griglia"/>
-            <xs:field xpath="gid"/>
+            <xs:selector xpath=".//prg-x7e-griglia" />
+            <xs:field xpath="gid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="prg-x7e-grigliaType" abstract="false" fdo:geometryName="the_geom">
@@ -3891,14 +3891,14 @@
                     <xs:element name="n_tavola" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value="8"/>
+                                <xs:maxLength value="8" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="prg~griglia" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="prg~griglia" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="gid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -3907,8 +3907,8 @@
     </xs:complexType>
     <xs:element name="strade-x7e-aree_circolazione_pedonali" type="OGRSchema:strade-x7e-aree_circolazione_pedonaliType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="strade-x7e-aree_circolazione_pedonaliKey">
-            <xs:selector xpath=".//strade-x7e-aree_circolazione_pedonali"/>
-            <xs:field xpath="id"/>
+            <xs:selector xpath=".//strade-x7e-aree_circolazione_pedonali" />
+            <xs:field xpath="id" />
         </xs:key>
     </xs:element>
     <xs:complexType name="strade-x7e-aree_circolazione_pedonaliType" abstract="false" fdo:geometryName="the_geom">
@@ -3918,73 +3918,73 @@
                     <xs:element name="codice_ctr" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="fondo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_aree_stradali" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="ogc_fid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="origine_geometria" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="periodizzazione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="posizione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sede" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sopra_a" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="zona" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="strade~aree_circolazione_pedonali" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="strade~aree_circolazione_pedonali" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="id" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -3993,8 +3993,8 @@
     </xs:complexType>
     <xs:element name="strade-x7e-aree_circolazione_veicolari" type="OGRSchema:strade-x7e-aree_circolazione_veicolariType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="strade-x7e-aree_circolazione_veicolariKey">
-            <xs:selector xpath=".//strade-x7e-aree_circolazione_veicolari"/>
-            <xs:field xpath="id"/>
+            <xs:selector xpath=".//strade-x7e-aree_circolazione_veicolari" />
+            <xs:field xpath="id" />
         </xs:key>
     </xs:element>
     <xs:complexType name="strade-x7e-aree_circolazione_veicolariType" abstract="false" fdo:geometryName="the_geom">
@@ -4004,66 +4004,66 @@
                     <xs:element name="codice_ctr" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="fondo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_aree_stradali" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="ogc_fid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="origine_geometria" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="periodizzazione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sede" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sopra_a" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="zona" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="strade~aree_circolazione_veicolari" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="strade~aree_circolazione_veicolari" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="id" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -4072,8 +4072,8 @@
     </xs:complexType>
     <xs:element name="strade-x7e-aree_circolazione_ciclabili" type="OGRSchema:strade-x7e-aree_circolazione_ciclabiliType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="strade-x7e-aree_circolazione_ciclabiliKey">
-            <xs:selector xpath=".//strade-x7e-aree_circolazione_ciclabili"/>
-            <xs:field xpath="id"/>
+            <xs:selector xpath=".//strade-x7e-aree_circolazione_ciclabili" />
+            <xs:field xpath="id" />
         </xs:key>
     </xs:element>
     <xs:complexType name="strade-x7e-aree_circolazione_ciclabiliType" abstract="false" fdo:geometryName="the_geom">
@@ -4083,66 +4083,66 @@
                     <xs:element name="codice_ctr" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="fondo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_aree_stradali" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="ogc_fid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="origine_geometria" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="periodizzazione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="posizione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sede" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="sopra_a" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="strade~aree_circolazione_ciclabili" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="strade~aree_circolazione_ciclabili" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="id" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -4151,8 +4151,8 @@
     </xs:complexType>
     <xs:element name="strade-x7e-aree_circolazione" type="OGRSchema:strade-x7e-aree_circolazioneType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="strade-x7e-aree_circolazioneKey">
-            <xs:selector xpath=".//strade-x7e-aree_circolazione"/>
-            <xs:field xpath="FID"/>
+            <xs:selector xpath=".//strade-x7e-aree_circolazione" />
+            <xs:field xpath="FID" />
         </xs:key>
     </xs:element>
     <xs:complexType name="strade-x7e-aree_circolazioneType" abstract="false" fdo:geometryName="the_geom">
@@ -4161,27 +4161,27 @@
                 <xs:sequence>
                     <xs:element name="id" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="toponimo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="strade~aree_circolazione" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="strade~aree_circolazione" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="FID" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -4190,8 +4190,8 @@
     </xs:complexType>
     <xs:element name="civici-x7e-accessi_ripetuti" type="OGRSchema:civici-x7e-accessi_ripetutiType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="civici-x7e-accessi_ripetutiKey">
-            <xs:selector xpath=".//civici-x7e-accessi_ripetuti"/>
-            <xs:field xpath="id"/>
+            <xs:selector xpath=".//civici-x7e-accessi_ripetuti" />
+            <xs:field xpath="id" />
         </xs:key>
     </xs:element>
     <xs:complexType name="civici-x7e-accessi_ripetutiType" abstract="false" fdo:geometryName="the_geom">
@@ -4200,59 +4200,59 @@
                 <xs:sequence>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="dismesso" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_accessi_principali" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_passo_carraio" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_targhe" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="note" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_da_murare" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~accessi_ripetuti" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~accessi_ripetuti" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="id" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -4261,8 +4261,8 @@
     </xs:complexType>
     <xs:element name="civici-x7e-accessi_principali" type="OGRSchema:civici-x7e-accessi_principaliType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="civici-x7e-accessi_principaliKey">
-            <xs:selector xpath=".//civici-x7e-accessi_principali"/>
-            <xs:field xpath="id"/>
+            <xs:selector xpath=".//civici-x7e-accessi_principali" />
+            <xs:field xpath="id" />
         </xs:key>
     </xs:element>
     <xs:complexType name="civici-x7e-accessi_principaliType" abstract="false" fdo:geometryName="the_geom">
@@ -4271,132 +4271,132 @@
                 <xs:sequence>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="codice_strada" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="esponente" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_edf_unita_volumetrica" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_passo_carraio" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_sezione_censuaria" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id_targhe" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="note" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="numero" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_codice_strada" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_esponente" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_numero" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_da_murare" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="progetto_targhetta_tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="rilievo_accesso_sequenziale" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="rilievo_numero_alloggi" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="rilievo_numero_attivita" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato_progetto" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~accessi_principali" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~accessi_principali" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="id" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -4405,8 +4405,8 @@
     </xs:complexType>
     <xs:element name="strade-x7e-aree_stradali_view" type="OGRSchema:strade-x7e-aree_stradali_viewType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="strade-x7e-aree_stradali_viewKey">
-            <xs:selector xpath=".//strade-x7e-aree_stradali_view"/>
-            <xs:field xpath="ogc_fid"/>
+            <xs:selector xpath=".//strade-x7e-aree_stradali_view" />
+            <xs:field xpath="ogc_fid" />
         </xs:key>
     </xs:element>
     <xs:complexType name="strade-x7e-aree_stradali_viewType" abstract="false" fdo:geometryName="the_geom">
@@ -4416,54 +4416,54 @@
                     <xs:element name="classificazione_funzionale" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="codice_toponimi_stradali" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="denominazione" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="id" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="label" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="strade~aree_stradali_view" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="strade~aree_stradali_view" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="ogc_fid" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -4472,8 +4472,8 @@
     </xs:complexType>
     <xs:element name="civici-x7e-targhe_stradali" type="OGRSchema:civici-x7e-targhe_stradaliType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="civici-x7e-targhe_stradaliKey">
-            <xs:selector xpath=".//civici-x7e-targhe_stradali"/>
-            <xs:field xpath="id"/>
+            <xs:selector xpath=".//civici-x7e-targhe_stradali" />
+            <xs:field xpath="id" />
         </xs:key>
     </xs:element>
     <xs:complexType name="civici-x7e-targhe_stradaliType" abstract="false" fdo:geometryName="the_geom">
@@ -4482,41 +4482,41 @@
                 <xs:sequence>
                     <xs:element name="angolo" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="xs:double"/>
+                            <xs:restriction base="xs:double" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="codice_strada" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="materiale" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="testo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="tipo" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~targhe_stradali" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="civici~targhe_stradali" fdo:geometricTypes="point " fdo:geometryTypes="point multipoint " />
                     <xs:element name="id" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -4525,8 +4525,8 @@
     </xs:complexType>
     <xs:element name="strade-x7e-aree_stradali_limiti" type="OGRSchema:strade-x7e-aree_stradali_limitiType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="strade-x7e-aree_stradali_limitiKey">
-            <xs:selector xpath=".//strade-x7e-aree_stradali_limiti"/>
-            <xs:field xpath="id"/>
+            <xs:selector xpath=".//strade-x7e-aree_stradali_limiti" />
+            <xs:field xpath="id" />
         </xs:key>
     </xs:element>
     <xs:complexType name="strade-x7e-aree_stradali_limitiType" abstract="false" fdo:geometryName="the_geom">
@@ -4535,13 +4535,13 @@
                 <xs:sequence>
                     <xs:element name="id_aree_stradali" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="strade~aree_stradali_limiti" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="strade~aree_stradali_limiti" fdo:geometricTypes="curve " fdo:geometryTypes="linestring multilinestring curvestring multicurvestring " />
                     <xs:element name="id" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>
@@ -4550,8 +4550,8 @@
     </xs:complexType>
     <xs:element name="strade-x7e-aree_stradali" type="OGRSchema:strade-x7e-aree_stradaliType" abstract="false" substitutionGroup="gml:_Feature">
         <xs:key name="strade-x7e-aree_stradaliKey">
-            <xs:selector xpath=".//strade-x7e-aree_stradali"/>
-            <xs:field xpath="id"/>
+            <xs:selector xpath=".//strade-x7e-aree_stradali" />
+            <xs:field xpath="id" />
         </xs:key>
     </xs:element>
     <xs:complexType name="strade-x7e-aree_stradaliType" abstract="false" fdo:geometryName="the_geom">
@@ -4561,33 +4561,33 @@
                     <xs:element name="classificazione_funzionale" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="codice_toponimi_stradali" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="ogc_fid" minOccurs="0">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                     <xs:element name="stato" minOccurs="0">
                         <xs:simpleType>
                             <xs:restriction base="xs:string">
-                                <xs:maxLength value=""/>
+                                <xs:maxLength value="" />
                             </xs:restriction>
                         </xs:simpleType>
                     </xs:element>
-                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="strade~aree_stradali" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon "/>
+                    <xs:element name="the_geom" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="strade~aree_stradali" fdo:geometricTypes="surface " fdo:geometryTypes="polygon multipolygon curvepolygon multicurvepolygon " />
                     <xs:element name="id" fdo:readOnly="true" minOccurs="0" fdo:autogenerated="true">
                         <xs:simpleType>
-                            <xs:restriction base="fdo:int32"/>
+                            <xs:restriction base="fdo:int32" />
                         </xs:simpleType>
                     </xs:element>
                 </xs:sequence>

Modified: trunk/Tools/Maestro/MaestroAPITests/UserTestData/InvalidLayer.xml
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/UserTestData/InvalidLayer.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/UserTestData/InvalidLayer.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -8,7 +8,7 @@
     <VectorScaleRange>
       <LineTypeStyle>
         <LineRule>
-          <LegendLabel/>
+          <LegendLabel />
           <LineSymbolization2D>
             <LineStyle>Rail</LineStyle>
             <Thickness>0.0</Thickness>
@@ -20,4 +20,4 @@
       </LineTypeStyle>
     </VectorScaleRange>
   </VectorLayerDefinition>
-</LayerDefinition>
+</LayerDefinition>
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/UserTestData/NASA_WMS_config_doc.xml
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/UserTestData/NASA_WMS_config_doc.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/UserTestData/NASA_WMS_config_doc.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -4,8 +4,8 @@
   <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://fdo.osgeo.org/schemas/feature/WMS" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:WMS="http://fdo.osgeo.org/schemas/feature/WMS" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:element name="NASAWMSGlobalPan" type="WMS:NASAWMSGlobalPanType" abstract="false" substitutionGroup="gml:_Feature">
       <xs:key name="NASAWMSGlobalPanKey">
-        <xs:selector xpath=".//NASAWMSGlobalPan"/>
-        <xs:field xpath="Id"/>
+        <xs:selector xpath=".//NASAWMSGlobalPan" />
+        <xs:field xpath="Id" />
       </xs:key>
     </xs:element>
     <xs:complexType name="NASAWMSGlobalPanType" abstract="false">
@@ -15,14 +15,14 @@
             <xs:element name="Id">
               <xs:simpleType>
                 <xs:restriction base="xs:string">
-                  <xs:maxLength value="256"/>
+                  <xs:maxLength value="256" />
                 </xs:restriction>
               </xs:simpleType>
             </xs:element>
             <xs:element name="Image" type="fdo:RasterPropertyType" fdo:defaultImageXSize="800" fdo:defaultImageYSize="600">
               <xs:annotation>
                 <xs:appinfo source="http://fdo.osgeo.org/schemas">
-                  <fdo:DefaultDataModel organization="Row" bitsPerPixel="32" tileSizeX="100" tileSizeY="100"/>
+                  <fdo:DefaultDataModel organization="Row" bitsPerPixel="32" tileSizeX="100" tileSizeY="100" />
                 </xs:appinfo>
               </xs:annotation>
             </xs:element>
@@ -41,9 +41,9 @@
         <Elevation>0</Elevation>
         <SpatialContext>EPSG:4326</SpatialContext>
         <Layer name="global_mosaic">
-          <Style/>
+          <Style />
         </Layer>
       </RasterDefinition>
     </complexType>
   </SchemaMapping>
-</fdo:DataStore>
+</fdo:DataStore>
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/UserTestData/SpaceShip.xml
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/UserTestData/SpaceShip.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/UserTestData/SpaceShip.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -5,4 +5,4 @@
     <Sheet>com.autodesk.dwf.ePlot_9E2723744244DB8C44482263E654F764</Sheet>
     <LayerFilter>YELLOW,CYAN,GREEN,RED,BLUE,WHITE</LayerFilter>
   </DrawingLayerDefinition>
-</LayerDefinition>
+</LayerDefinition>
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/UserTestData/TestMapWithInvalidLayers.xml
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/UserTestData/TestMapWithInvalidLayers.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/UserTestData/TestMapWithInvalidLayers.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?> 
+<?xml version="1.0" encoding="UTF-8"?>
 <MapDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="MapDefinition-1.0.0.xsd">
-  <Name>New Map</Name> 
-  <CoordinateSystem>GEOGCS["WGS84 Lat/Long's, Degrees, -180 ==> +180",DATUM["D_WGS_1984",SPHEROID["World_Geodetic_System_of_1984",6378137,298.257222932867]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]</CoordinateSystem> 
+  <Name>New Map</Name>
+  <CoordinateSystem>GEOGCS["WGS84 Lat/Long's, Degrees, -180 ==> +180",DATUM["D_WGS_1984",SPHEROID["World_Geodetic_System_of_1984",6378137,298.257222932867]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]</CoordinateSystem>
   <Extents>
-    <MinX>-87.770746109180749</MinX> 
-    <MaxX>-87.6957605384125</MaxX> 
-    <MinY>43.686899685828813</MinY> 
-    <MaxY>43.805498742206247</MaxY> 
+    <MinX>-87.770746109180749</MinX>
+    <MaxX>-87.6957605384125</MaxX>
+    <MinY>43.686899685828813</MinY>
+    <MaxY>43.805498742206247</MaxY>
   </Extents>
-  <BackgroundColor>FFFFFFFF</BackgroundColor> 
+  <BackgroundColor>FFFFFFFF</BackgroundColor>
   <MapLayer>
-    <Name>Rail</Name> 
-    <ResourceId>Library://UnitTests/Layers/Rail.LayerDefinition</ResourceId> 
-    <Selectable>true</Selectable> 
-    <ShowInLegend>true</ShowInLegend> 
-    <LegendLabel>Rail</LegendLabel> 
-    <ExpandInLegend>true</ExpandInLegend> 
-    <Visible>true</Visible> 
-    <Group /> 
+    <Name>Rail</Name>
+    <ResourceId>Library://UnitTests/Layers/Rail.LayerDefinition</ResourceId>
+    <Selectable>true</Selectable>
+    <ShowInLegend>true</ShowInLegend>
+    <LegendLabel>Rail</LegendLabel>
+    <ExpandInLegend>true</ExpandInLegend>
+    <Visible>true</Visible>
+    <Group />
   </MapLayer>
   <MapLayer>
     <Name>Invalid</Name>
@@ -30,23 +30,23 @@
     <Group />
   </MapLayer>
   <MapLayer>
-    <Name>HydrographicPolygons</Name> 
-    <ResourceId>Library://UnitTests/Layers/HydrographicPolygons.LayerDefinition</ResourceId> 
-    <Selectable>true</Selectable> 
-    <ShowInLegend>true</ShowInLegend> 
-    <LegendLabel>HydrographicPolygons</LegendLabel> 
-    <ExpandInLegend>true</ExpandInLegend> 
-    <Visible>true</Visible> 
-    <Group /> 
+    <Name>HydrographicPolygons</Name>
+    <ResourceId>Library://UnitTests/Layers/HydrographicPolygons.LayerDefinition</ResourceId>
+    <Selectable>true</Selectable>
+    <ShowInLegend>true</ShowInLegend>
+    <LegendLabel>HydrographicPolygons</LegendLabel>
+    <ExpandInLegend>true</ExpandInLegend>
+    <Visible>true</Visible>
+    <Group />
   </MapLayer>
   <MapLayer>
-    <Name>Parcels</Name> 
-    <ResourceId>Library://UnitTests/Layers/Parcels.LayerDefinition</ResourceId> 
-    <Selectable>true</Selectable> 
-    <ShowInLegend>true</ShowInLegend> 
-    <LegendLabel>Parcels</LegendLabel> 
-    <ExpandInLegend>true</ExpandInLegend> 
-    <Visible>true</Visible> 
-    <Group /> 
+    <Name>Parcels</Name>
+    <ResourceId>Library://UnitTests/Layers/Parcels.LayerDefinition</ResourceId>
+    <Selectable>true</Selectable>
+    <ShowInLegend>true</ShowInLegend>
+    <LegendLabel>Parcels</LegendLabel>
+    <ExpandInLegend>true</ExpandInLegend>
+    <Visible>true</Visible>
+    <Group />
   </MapLayer>
-</MapDefinition>
+</MapDefinition>
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/UserTestData/wms_config_example1.xml
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/UserTestData/wms_config_example1.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/UserTestData/wms_config_example1.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
-WMS configuration document for 
+<!--
+WMS configuration document for
 
 http://nowcoast.noaa.gov/wms/com.esri.wms.Esrimap/obs
  -->

Modified: trunk/Tools/Maestro/MaestroAPITests/UserTestData/wms_config_example2.xml
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/UserTestData/wms_config_example2.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/UserTestData/wms_config_example2.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
-WMS configuration document for 
+<!--
+WMS configuration document for
 
 http://trac.osgeo.org/mapguide/ticket/1680
  -->

Modified: trunk/Tools/Maestro/MaestroAPITests/ValidationTests.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/ValidationTests.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/ValidationTests.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,37 +1,36 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NUnit.Framework;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using NMock2;
+//
 
-using LoadProc = OSGeo.MapGuide.ObjectModels.LoadProcedure;
+#endregion Disclaimer / License
+
+using NMock2;
+using NUnit.Framework;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.LoadProcedure;
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using OSGeo.MapGuide.ObjectModels.LoadProcedure;
+using System;
 using System.Xml;
 
 namespace MaestroAPITests
@@ -98,7 +97,8 @@
         }
 
         #region Mocks
-        class MockResourceService : IResourceService
+
+        private class MockResourceService : IResourceService
         {
             public event ResourceEventHandler ResourceAdded;
 
@@ -277,7 +277,7 @@
             }
         }
 
-        class MockFeatureService : IFeatureService
+        private class MockFeatureService : IFeatureService
         {
             public OSGeo.MapGuide.ObjectModels.Capabilities.IFdoProviderCapabilities GetProviderCapabilities(string provider)
             {
@@ -414,7 +414,6 @@
                 throw new NotImplementedException();
             }
 
-
             public OSGeo.MapGuide.ObjectModels.Common.ILongTransactionList GetLongTransactions(string resourceId, bool activeOnly)
             {
                 throw new NotImplementedException();
@@ -425,14 +424,14 @@
                 throw new NotImplementedException();
             }
 
-
             public OSGeo.MapGuide.MaestroAPI.Feature.IFeatureReader QueryFeatureSource(string resourceID, string className, string filter, string[] propertyNames, System.Collections.Specialized.NameValueCollection computedProperties, int limit)
             {
                 throw new NotImplementedException();
             }
         }
-        #endregion
 
+        #endregion Mocks
+
         [Test]
         public void TestLoadProcedureValidation()
         {
@@ -445,7 +444,7 @@
             var conn = mock.NewMock<IServerConnection>();
             var featSvc = new MockFeatureService();
             var resSvc = new MockResourceService();
-            var lp = ObjectFactory.CreateLoadProcedure(conn, LoadType.Sdf, new string[] 
+            var lp = ObjectFactory.CreateLoadProcedure(conn, LoadType.Sdf, new string[]
             {
                 "C:\\foo.sdf",
                 "C:\\bar.sdf"
@@ -460,7 +459,7 @@
             //SDF2, generalization and 2 missing files
             Assert.AreEqual(4, set.GetAllIssues().Length);
 
-            lp = ObjectFactory.CreateLoadProcedure(conn, LoadType.Shp, new string[] 
+            lp = ObjectFactory.CreateLoadProcedure(conn, LoadType.Shp, new string[]
             {
                 "C:\\foo.shp",
                 "C:\\bar.shp"
@@ -542,7 +541,7 @@
             }
 
             Assert.True(hasIssue);
-            
+
             //Case described in trac #1472
             var ldf2 = ObjectFactory.CreateDefaultLayer(conn, OSGeo.MapGuide.ObjectModels.LayerDefinition.LayerType.Vector, new Version(1, 0, 0));
             ldf2.ResourceID = "Library://Test/Foo.LayerDefinition";
@@ -584,7 +583,7 @@
         {
             var fs = new FeatureSchema();
             var doc = new XmlDocument();
-            
+
             doc.Load("UserTestData\\1896.xml");
 
             var mgr = new XmlNamespaceManager(doc.NameTable);
@@ -603,4 +602,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroAPITests/packages.config
===================================================================
--- trunk/Tools/Maestro/MaestroAPITests/packages.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroAPITests/packages.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="2.6.3" targetFramework="net40" />
+    <package id="NUnit" version="2.6.3" targetFramework="net40" />
 </packages>
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroFsPreview/MainForm.cs
===================================================================
--- trunk/Tools/Maestro/MaestroFsPreview/MainForm.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroFsPreview/MainForm.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors;
 using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using Maestro.Editors;
+using System;
+using System.Windows.Forms;
 
 namespace MaestroFsPreview
 {
@@ -64,8 +61,8 @@
         public string FeatureSourceID
         {
             get { return txtFeatureSource.Text; }
-            set 
-            { 
+            set
+            {
                 txtFeatureSource.Text = value;
                 InitPreview();
             }
@@ -80,4 +77,4 @@
             localFsPreviewCtrl.ReloadTree(this.FeatureSourceID, caps);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroFsPreview/Program.cs
===================================================================
--- trunk/Tools/Maestro/MaestroFsPreview/Program.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroFsPreview/Program.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,40 +1,41 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Editors;
+using Maestro.Login;
+using OSGeo.MapGuide.MaestroAPI;
 using System;
-using System.Collections.Generic;
+using System.Diagnostics;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Login;
-using Maestro.Editors;
-using System.Diagnostics;
 
 namespace MaestroFsPreview
 {
-    static class Program
+    internal static class Program
     {
-        class EditorServiceImpl : ResourceEditorServiceBase
+        private class EditorServiceImpl : ResourceEditorServiceBase
         {
             public EditorServiceImpl(IServerConnection conn)
                 : base("Session://", conn)
             {
-
             }
 
             public override void OpenResource(string resourceId)
@@ -68,12 +69,11 @@
             }
         }
 
-
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
         [STAThread]
-        static void Main(string [] args)
+        private static void Main(string[] args)
         {
             var parser = new ArgumentParser(args);
             Application.EnableVisualStyles();
@@ -101,4 +101,4 @@
             Application.Run(new MainForm(new EditorServiceImpl(conn)));
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MaestroFsPreview/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/MaestroFsPreview/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroFsPreview/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("MaestroFsPreview")]
@@ -11,8 +10,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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)]
 

Modified: trunk/Tools/Maestro/MaestroFsPreview/app.config
===================================================================
--- trunk/Tools/Maestro/MaestroFsPreview/app.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MaestroFsPreview/app.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <configuration>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
-  </startup>
-  <!-- 
-  Uncomment the section below for proxy server support. 
-  
-  Note this doesn't work in Mono (see http://trac.osgeo.org/mapguide/ticket/2414)  
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+    </startup>
+    <!--
+  Uncomment the section below for proxy server support.
+
+  Note this doesn't work in Mono (see http://trac.osgeo.org/mapguide/ticket/2414)
   -->
-  <!--
+    <!--
   <system.net>
     <defaultProxy useDefaultCredentials="true" />
   </system.net>
   -->
-</configuration>
+</configuration>
\ No newline at end of file

Modified: trunk/Tools/Maestro/MgCooker/CommandLineParser.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/CommandLineParser.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MgCooker/CommandLineParser.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
-using System;
+//
+
+#endregion Disclaimer / License
+
 using System.Collections.Generic;
-using System.Text;
 
 namespace Duplicati.CommandLine
 {
@@ -59,4 +60,4 @@
             return options;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MgCooker/Program.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/Program.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MgCooker/Program.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using Duplicati.CommandLine;
 using Maestro.Login;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.MaestroAPI;
-using System.Collections.Specialized;
-using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ExtendedObjectModels;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Tile;
+using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.ObjectModels.Common;
+using System;
+using System.Collections.Generic;
 
 namespace MgCooker
 {
@@ -44,7 +45,7 @@
         private static long tileCount;
         private static long totalTiles;
         private static TimeSpan prevDuration;
-        
+
         private static long mapCount;
         private static long groupCount;
 
@@ -69,7 +70,7 @@
             //extentoverride=minx,miny,maxx,maxy
 
             Boolean cmdLineMode = false;
-            
+
             string mapdefinitions = "";
             string scaleindex = "";
             string basegroups = "";
@@ -84,7 +85,7 @@
             string metersPerUnit = "";
 
             IEnvelope overrideExtents = null;
-            
+
             List<string> largs = new List<string>(args);
             Dictionary<string, string> opts = CommandLineParser.ExtractOptions(largs);
             if (opts.ContainsKey(TileRunParameters.MAPDEFINITIONS))
@@ -129,7 +130,6 @@
                 }
             }
 
-
             if (largs.IndexOf("batch") >= 0 || largs.IndexOf("/batch") >= 0 || largs.IndexOf("commandline") >= 0 || largs.IndexOf("/commandline") >= 0)
             {
                 cmdLineMode = true;
@@ -146,7 +146,6 @@
                 m_loggableProgress = false;
             }
 
-
             IServerConnection connection = null;
 
             string[] maps = mapdefinitions.Split(',');
@@ -188,8 +187,6 @@
                 }
             }
 
-
-
             if (!cmdLineMode)
             {
                 SetupRun sr = null;
@@ -204,10 +201,9 @@
                     return;
                 }
             }
-            
 
             TilingRunCollection bx = new TilingRunCollection(connection);
-            
+
             int x;
 
             if (!string.IsNullOrEmpty(limitCols) && int.TryParse(limitCols, out x))
@@ -222,7 +218,7 @@
 
             if (!string.IsNullOrEmpty(DPI) && int.TryParse(DPI, out x))
                 bx.Config.DPI = x;
-            
+
             double d;
             if (!string.IsNullOrEmpty(metersPerUnit) && double.TryParse(metersPerUnit, System.Globalization.NumberStyles.Float, System.Globalization.CultureInfo.CurrentCulture, out d))
             {
@@ -238,7 +234,7 @@
             //Now that all global parameters are set, we can now add the map definitions
             bx.AddMapDefinitions(maps);
 
-            //basegroups must be set in each mapdefinition 
+            //basegroups must be set in each mapdefinition
             if (!string.IsNullOrEmpty(basegroups))
             {
                 List<string> groups = new List<string>();
@@ -263,7 +259,7 @@
                         scales.Add(tmp);
                 foreach (MapTilingConfiguration bm in bx.Maps)
                     bm.SetScalesAndExtend(scales.ToArray(), overrideExtents);
-            } 
+            }
             else if (!string.IsNullOrEmpty(scaleindex))
             {
                 List<int> scales = new List<int>();
@@ -274,8 +270,6 @@
                 bx.SetScales(scales.ToArray());
             }
 
-            
-
             if (!cmdLineMode)
             {
                 Progress pg = new Progress(bx);
@@ -301,13 +295,13 @@
             }
         }
 
-        static void bx_FailedRenderingTile(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref Exception exception)
+        private static void bx_FailedRenderingTile(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref Exception exception)
         {
             exceptionList.Add(exception);
             exception = null;
         }
 
-        static void DisplayProgress(MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
+        private static void DisplayProgress(MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
         {
             if (hasConsole)
                 Console.Clear();
@@ -327,15 +321,14 @@
             }
         }
 
-
-        static void bx_FinishRenderingGroup(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
+        private static void bx_FinishRenderingGroup(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
         {
             TimeSpan duration = DateTime.Now - beginGroup;
             if (m_loggableProgress)
                 Console.WriteLine(string.Format(Strings.ConsoleOperationFinishGroup, DateTime.Now, group, duration));
         }
 
-        static void bx_BeginRenderingGroup(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
+        private static void bx_BeginRenderingGroup(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
         {
             groupCount++;
             beginGroup = DateTime.Now;
@@ -348,7 +341,7 @@
             totalTiles = map.TotalTiles;
         }
 
-        static void bx_FinishRenderingTile(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
+        private static void bx_FinishRenderingTile(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
         {
             tileRuns.Add(DateTime.Now - beginTile);
             tileCount++;
@@ -371,7 +364,7 @@
 
                 tileRuns.Clear();
                 lastUpdate = DateTime.Now;
-                
+
                 if (m_loggableProgress)
                     Console.WriteLine(string.Format(Strings.ConsoleOperationFinishTile, tileCount, totalTiles, group, duration));
                 else
@@ -379,26 +372,26 @@
             }
         }
 
-        static void bx_BeginRenderingTile(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
+        private static void bx_BeginRenderingTile(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
         {
             beginTile = DateTime.Now;
         }
 
-        static void bx_FinishRenderingScale(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
+        private static void bx_FinishRenderingScale(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
         {
             TimeSpan duration = DateTime.Now - beginScale;
             if (m_loggableProgress)
                 Console.WriteLine(string.Format(Strings.ConsoleOperationFinishScale, DateTime.Now, map.MapDefinition.BaseMap.GetScaleAt(scaleindex), duration));
         }
 
-        static void bx_BeginRenderingScale(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
+        private static void bx_BeginRenderingScale(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
         {
             beginScale = DateTime.Now;
             if (m_loggableProgress)
                 Console.WriteLine(string.Format(Strings.ConsoleOperationBeginScale, beginMap, map.MapDefinition.BaseMap.GetScaleAt(scaleindex), scaleindex, map.Resolutions));
         }
 
-        static void bx_FinishRenderingMap(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
+        private static void bx_FinishRenderingMap(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
         {
             groupCount = 0;
             TimeSpan duration = DateTime.Now - beginMap;
@@ -406,7 +399,7 @@
                 Console.WriteLine(string.Format(Strings.ConsoleOperationFinishMap, DateTime.Now, map.ResourceId, duration));
         }
 
-        static void bx_BeginRenderingMap(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
+        private static void bx_BeginRenderingMap(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
         {
             mapCount++;
             beginMap = DateTime.Now;
@@ -414,4 +407,4 @@
                 Console.WriteLine(string.Format(Strings.ConsoleOperationBeginMap, beginMap, map.ResourceId));
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MgCooker/Progress.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/Progress.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MgCooker/Progress.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Tile;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Tile;
 
 namespace MgCooker
 {
@@ -74,7 +73,7 @@
             m_grandBegin = DateTime.Now;
         }
 
-        void bx_FailedRenderingTile(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref Exception exception)
+        private void bx_FailedRenderingTile(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref Exception exception)
         {
             m_failCount++;
             exception = null; //Eat it
@@ -96,7 +95,7 @@
             this.Close();
         }
 
-        void bx_FinishRenderingMaps(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
+        private void bx_FinishRenderingMaps(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
         {
             if (this.InvokeRequired)
                 this.Invoke(new System.Threading.ThreadStart(DoClose));
@@ -104,7 +103,7 @@
                 DoClose();
         }
 
-        void bx_FinishRenderingTile(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
+        private void bx_FinishRenderingTile(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
         {
             m_tileRuns.Add(DateTime.Now - m_beginTile);
             m_tileCount++;
@@ -149,7 +148,7 @@
                 tilePG.Value = (int)Math.Max(Math.Min((m_tileCount / (double)m_totalTiles) * (tilePG.Maximum - tilePG.Minimum), tilePG.Maximum), tilePG.Minimum);
                 totalPG.Value = (int)Math.Max(Math.Min((m_grandTotalTileCount / (double)m_grandTotalTiles) * (totalPG.Maximum - totalPG.Minimum), totalPG.Maximum), totalPG.Minimum);
 
-                this.Text = m_origTitle + " - (" + (int)(((double)m_grandTotalTileCount / (double)m_grandTotalTiles) * 100.0) +"%)";
+                this.Text = m_origTitle + " - (" + (int)(((double)m_grandTotalTileCount / (double)m_grandTotalTiles) * 100.0) + "%)";
 
                 if (m_failCount == 0)
                     tileCounter.Text = string.Format(Strings.CurrentTileCounter, m_grandTotalTileCount, m_grandTotalTiles, "");
@@ -167,23 +166,22 @@
             }
         }
 
-
-        void bx_BeginRenderingTile(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
+        private void bx_BeginRenderingTile(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
         {
             m_beginTile = DateTime.Now;
         }
 
-        void bx_BeginRenderingScale(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
+        private void bx_BeginRenderingScale(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
         {
         }
 
-        void bx_BeginRenderingGroup(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
+        private void bx_BeginRenderingGroup(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
         {
             m_totalTiles = map.TotalTiles;
             m_tileCount = 0;
         }
 
-        void bx_BeginRenderingMap(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
+        private void bx_BeginRenderingMap(CallbackStates state, MapTilingConfiguration map, string group, int scaleindex, int row, int column, ref bool cancel)
         {
             m_tileCount = 0;
         }
@@ -225,6 +223,5 @@
             MessageBox.Show(this, Strings.PauseMessage, Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Information);
             m_bx.PauseEvent.Set();
         }
-
     }
 }
\ No newline at end of file

Modified: trunk/Tools/Maestro/MgCooker/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MgCooker/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("MgCooker")]
@@ -11,10 +10,10 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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("d7062967-45e9-419a-b577-97f6ebf8e7cc")]
+[assembly: Guid("d7062967-45e9-419a-b577-97f6ebf8e7cc")]
\ No newline at end of file

Modified: trunk/Tools/Maestro/MgCooker/SetupRun.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/SetupRun.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MgCooker/SetupRun.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,43 +1,41 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
+using OSGeo.MapGuide.MaestroAPI.Commands;
 using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using System.Collections.Specialized;
 using OSGeo.MapGuide.MaestroAPI.Tile;
 using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.ObjectModels.Common;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Reflection;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI.Commands;
-using System.Diagnostics;
-using Maestro.Shared.UI;
+using System.Text;
+using System.Windows.Forms;
 
 namespace MgCooker
 {
@@ -111,7 +109,7 @@
 
             if (m_commandlineargs.ContainsKey(TileRunParameters.EXTENTOVERRIDE)) //NOXLATE
             {
-                 string[] parts = m_commandlineargs[TileRunParameters.EXTENTOVERRIDE].Split(',');
+                string[] parts = m_commandlineargs[TileRunParameters.EXTENTOVERRIDE].Split(',');
                 if (parts.Length == 4)
                 {
                     double minx;
@@ -128,7 +126,6 @@
                         overrideExtents = ObjectFactory.CreateEnvelope(minx, miny, maxx, maxy);
                     }
                 }
-
             }
 
             if (m_commandlineargs.ContainsKey(TileRunParameters.METERSPERUNIT)) //NOXLATE
@@ -152,7 +149,6 @@
                 maps = tmp.ToArray();
             }
 
-            
             var basegroupsSelected = new List<string>();
             if (m_commandlineargs.ContainsKey(TileRunParameters.BASEGROUPS))//NOXLATE
             {
@@ -179,11 +175,11 @@
 
                 IBaseMapDefinition baseMap = mdef.BaseMap;
                 if (baseMap != null &&
-                    baseMap.ScaleCount > 0 && 
+                    baseMap.ScaleCount > 0 &&
                     baseMap.HasGroups())
                 {
                     TreeNode mn = MapTree.Nodes.Add(m);
-                    
+
                     mn.ImageIndex = mn.SelectedImageIndex = 0;
                     mn.Tag = mdef;
                     foreach (var g in baseMap.BaseMapLayerGroup)
@@ -199,7 +195,7 @@
                                 m_coordinateOverrides.Add(m, overrideExtents);
                             }
                         }
-                        
+
                         gn.ImageIndex = gn.SelectedImageIndex = 1;
 
                         int counter = 0;
@@ -209,7 +205,6 @@
                             if (gn.Checked && scalesSelected.Contains(counter))
                             {
                                 sn.Checked = true;
-                                
                             }
                             sn.ImageIndex = sn.SelectedImageIndex = 3;
                             counter++;
@@ -251,8 +246,8 @@
                 {
                     MapTilingConfiguration bm = new MapTilingConfiguration(bx, c.MapDefinition);
                     bm.SetGroups(new string[] { c.Group });
-                    bm.SetScalesAndExtend(c.ScaleIndexes,c.ExtentOverride);
-                   
+                    bm.SetScalesAndExtend(c.ScaleIndexes, c.ExtentOverride);
+
                     bx.Maps.Add(bm);
                 }
 
@@ -339,7 +334,6 @@
                 if (RandomTileOrder.Checked)
                     args.Add("--" + TileRunParameters.RANDOMTILEORDER + ""); //NOXLATE
 
-
                 string executable = System.IO.Path.GetFileName(System.Reflection.Assembly.GetExecutingAssembly().Location);
                 string cmdExecutable = "MgCookerCmd.exe"; //NOXLATE
 
@@ -366,7 +360,7 @@
                         sw.WriteLine("@echo off"); //NOXLATE
                     }
 
-                    //If on windows, wrap the exe call in a pushd/popd so that the executable is 
+                    //If on windows, wrap the exe call in a pushd/popd so that the executable is
                     //executed from its own directory
 
                     if (System.Environment.OSVersion.Platform != PlatformID.MacOSX ||
@@ -455,7 +449,7 @@
                 {
                     foreach (TreeNode tn in n.Nodes)
                         tn.Checked = e.Node.Checked;
-                    
+
                     n.Checked = e.Node.Checked;
                 }
 
@@ -583,14 +577,14 @@
             }
         }
 
-        enum MpuMethod
+        private enum MpuMethod
         {
             CreateRuntimeMap,
             MpuCalcExe,
             BuiltIn
         }
 
-        class MpuCalcResult
+        private class MpuCalcResult
         {
             public MpuMethod Method;
             public decimal Result;
@@ -598,7 +592,8 @@
 
         private void TryCalcMpu(string mapDef)
         {
-            BusyWaitDialog.Run(Strings.CalculatingMpu, () => {
+            BusyWaitDialog.Run(Strings.CalculatingMpu, () =>
+            {
                 var currentPath = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath);
                 var mpuCalc = Path.Combine(currentPath, "AddIns/Local/MpuCalc.exe");
                 if (!File.Exists(mpuCalc))
@@ -656,7 +651,8 @@
                     else
                         return string.Format(Strings.FailedToCalculateMpu, output);
                 }
-            }, (res, ex) => {
+            }, (res, ex) =>
+            {
                 if (ex != null)
                 {
                     ErrorDialog.Show(ex);
@@ -680,4 +676,4 @@
             });
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MgCooker/app.config
===================================================================
--- trunk/Tools/Maestro/MgCooker/app.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MgCooker/app.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <configuration>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>
-  </startup>
-  <!-- 
-  Uncomment the section below for proxy server support. 
-  
-  Note this doesn't work in Mono (see http://trac.osgeo.org/mapguide/ticket/2414)  
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client" />
+    </startup>
+    <!--
+  Uncomment the section below for proxy server support.
+
+  Note this doesn't work in Mono (see http://trac.osgeo.org/mapguide/ticket/2414)
   -->
-  <!--
+    <!--
   <system.net>
     <defaultProxy useDefaultCredentials="true" />
   </system.net>
   -->
-</configuration>
+</configuration>
\ No newline at end of file

Modified: trunk/Tools/Maestro/MgCooker.Cmd/Program.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker.Cmd/Program.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MgCooker.Cmd/Program.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace MgCooker.Cmd
 {
-    class Program
+    internal class Program
     {
         [STAThread()]
-        static void Main(string[] args)
+        private static void Main(string[] args)
         {
             //Append the "/commandline" switch
             List<string> tmp = new List<string>(args);
@@ -34,4 +36,4 @@
             MgCooker.Program.Main(tmp.ToArray());
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MgCooker.Cmd/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker.Cmd/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MgCooker.Cmd/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("MgCooker.Cmd")]
@@ -11,8 +10,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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)]
 

Modified: trunk/Tools/Maestro/MgCooker.Cmd/app.config
===================================================================
--- trunk/Tools/Maestro/MgCooker.Cmd/app.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MgCooker.Cmd/app.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,3 +1,6 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client" />
+    </startup>
+</configuration>
\ No newline at end of file

Modified: trunk/Tools/Maestro/MpuCalc/App.config
===================================================================
--- trunk/Tools/Maestro/MpuCalc/App.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MpuCalc/App.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client" />
     </startup>
-</configuration>
+</configuration>
\ No newline at end of file

Modified: trunk/Tools/Maestro/MpuCalc/Program.cs
===================================================================
--- trunk/Tools/Maestro/MpuCalc/Program.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MpuCalc/Program.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,36 +1,35 @@
 #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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MpuCalc
 {
-    class Program
+    internal class Program
     {
-        static void Main(string[] args)
+        private static void Main(string[] args)
         {
             if (args.Length == 1)
             {
@@ -74,4 +73,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/MpuCalc/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/MpuCalc/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MpuCalc/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("MpuCalc")]
@@ -14,8 +13,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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)]
 
@@ -25,12 +24,12 @@
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file

Modified: trunk/Tools/Maestro/MpuCalc/packages.config
===================================================================
--- trunk/Tools/Maestro/MpuCalc/packages.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/MpuCalc/packages.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="mapguide-api-base-x86" version="2.5.2.7949" targetFramework="net45" />
+    <package id="mapguide-api-base-x86" version="2.5.2.7949" targetFramework="net45" />
 </packages>
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels/ModelSetup.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels/ModelSetup.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels/ModelSetup.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,64 +1,58 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Runtime.CompilerServices;
+//
 
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI;
+#endregion Disclaimer / License
 
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
+using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.ObjectModels.LoadProcedure;
+using System;
+using System.Runtime.CompilerServices;
 using Ldf110 = OSGeo.MapGuide.ObjectModels.LayerDefinition_1_1_0;
 using Ldf120 = OSGeo.MapGuide.ObjectModels.LayerDefinition_1_2_0;
 using Ldf130 = OSGeo.MapGuide.ObjectModels.LayerDefinition_1_3_0;
 using Ldf230 = OSGeo.MapGuide.ObjectModels.LayerDefinition_2_3_0;
 using Ldf240 = OSGeo.MapGuide.ObjectModels.LayerDefinition_2_4_0;
-
 using Lp110 = OSGeo.MapGuide.ObjectModels.LoadProcedure_1_1_0;
 using Lp220 = OSGeo.MapGuide.ObjectModels.LoadProcedure_2_2_0;
-using WL110 = OSGeo.MapGuide.ObjectModels.WebLayout_1_1_0;
-using WL240 = OSGeo.MapGuide.ObjectModels.WebLayout_2_4_0;
-using WL260 = OSGeo.MapGuide.ObjectModels.WebLayout_2_6_0;
-
-using Sym110 = OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0;
-using Sym240 = OSGeo.MapGuide.ObjectModels.SymbolDefinition_2_4_0;
-
 using Mdf230 = OSGeo.MapGuide.ObjectModels.MapDefinition_2_3_0;
 using Mdf240 = OSGeo.MapGuide.ObjectModels.MapDefinition_2_4_0;
-
+using Sym110 = OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0;
+using Sym240 = OSGeo.MapGuide.ObjectModels.SymbolDefinition_2_4_0;
 using Wdf230 = OSGeo.MapGuide.ObjectModels.WatermarkDefinition_2_3_0;
 using Wdf240 = OSGeo.MapGuide.ObjectModels.WatermarkDefinition_2_4_0;
+using WL110 = OSGeo.MapGuide.ObjectModels.WebLayout_1_1_0;
+using WL240 = OSGeo.MapGuide.ObjectModels.WebLayout_2_4_0;
+using WL260 = OSGeo.MapGuide.ObjectModels.WebLayout_2_6_0;
 
-using OSGeo.MapGuide.ObjectModels.LoadProcedure;
-using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
-using OSGeo.MapGuide.ObjectModels;
-
 namespace OSGeo.MapGuide.ExtendedObjectModels
 {
     /// <summary>
     /// <c>OSGeo.MapGuide.ExtendedObjectModels</c> provides the <see cref="ModelSetup"/> utility class, which
-    /// provides a convenient method of registering all known resources with schema versions greater than v1.0.0 
-    /// 
+    /// provides a convenient method of registering all known resources with schema versions greater than v1.0.0
+    ///
     /// </summary>
     [CompilerGenerated]
-    class NsDoc { }
+    internal class NsDoc { }
 
     /// <summary>
     /// A helper class that registers validatiors, serializers and factories for resource types beyond the initial version
@@ -71,7 +65,7 @@
     {
         /// <summary>
         /// Registers validators, serializers and instance factories of all known extended resource data types.
-        /// 
+        ///
         /// Invoke this method as part of your application's startup process before using any other part of the Maestro API
         /// </summary>
         /// <remarks>
@@ -216,4 +210,4 @@
             ObjectFactory.RegisterWatermarkDefinitionFactoryMethod(new Version(2, 4, 0), new WatermarkCreatorFunc(Wdf240.WdfEntryPoint.CreateDefault));
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ExtendedObjectModels/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OSGeo.MapGuide.ExtendedObjectModels")]
@@ -11,10 +10,10 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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("59a0a5e6-9ed7-4600-82e6-f48a993354bf")]
+[assembly: Guid("59a0a5e6-9ed7-4600-82e6-f48a993354bf")]
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ArgumentParser.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ArgumentParser.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ArgumentParser.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
+//
+
+#endregion Disclaimer / License
+
 using System.Collections.Generic;
-using System.Text;
 using System.Collections.Specialized;
 
 namespace OSGeo.MapGuide.MaestroAPI
@@ -29,7 +30,7 @@
     /// </summary>
     /// <remarks>
     /// Command-line arguments use the following format:
-    /// 
+    ///
     /// -name1 -name2[:value2] -name3[:value3]
     /// </remarks>
     public class ArgumentParser
@@ -126,4 +127,4 @@
         /// </summary>
         public const string Password = "Password"; //NOXLATE
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/BindingListExtensions.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/BindingListExtensions.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/BindingListExtensions.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.ComponentModel;
 
 namespace OSGeo.MapGuide.MaestroAPI
 {
     /// <summary>
-    /// Extension method class 
+    /// Extension method class
     /// </summary>
     public static class BindingListExtensions
     {
@@ -50,6 +50,7 @@
         }
     }
 }
+
 /*
 //A well known hack to get extension methods working in .net framework 2.0
 
@@ -60,6 +61,5 @@
     /// </summary>
     public class ExtensionAttribute : Attribute
     {
-
     }
-}*/
+}*/
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/ConnectionCapabilities.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/ConnectionCapabilities.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/ConnectionCapabilities.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
+using OSGeo.MapGuide.MaestroAPI.Services;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
 
 namespace OSGeo.MapGuide.MaestroAPI.Capability
 {
@@ -34,7 +36,7 @@
         /// <summary>
         /// Resource types supported on *all* versions of MapGuide
         /// </summary>
-        static string [] _defaultResTypes = new string[] 
+        private static string[] _defaultResTypes = new string[]
         {
             //ResourceTypes.RuntimeMap.ToString(),
             //ResourceTypes.Selection.ToString(),
@@ -78,21 +80,27 @@
                     if (!SupportsFusion())
                         throw new UnsupportedResourceTypeException("ApplicationDefinition");
                     break;
+
                 case "WatermarkDefinition":
                     ver = GetMaxWatermarkDefinitionVersion();
                     break;
+
                 case "MapDefinition":
                     ver = GetMaxMapDefinitionVersion();
                     break;
+
                 case "LayerDefinition":
                     ver = GetMaxLayerDefinitionVersion();
                     break;
+
                 case "LoadProcedure":
                     ver = GetMaxLoadProcedureVersion();
                     break;
+
                 case "WebLayout":
                     ver = GetMaxWebLayoutVersion();
                     break;
+
                 case "SymbolDefinition":
                     if (!SupportsAdvancedSymbols())
                         throw new UnsupportedResourceTypeException("SymbolDefinition");
@@ -206,7 +214,7 @@
                 return new Version(1, 2, 0);
             if (_parent.SiteVersion >= new Version(1, 2))
                 return new Version(1, 1, 0);
-            
+
             return new Version(1, 0, 0);
         }
 
@@ -328,7 +336,7 @@
         /// </summary>
         public string[] SupportedResourceTypes
         {
-            get 
+            get
             {
                 var ver = _parent.SiteVersion;
                 var types = new HashSet<string>(_defaultResTypes);
@@ -345,4 +353,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Capability/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace OSGeo.MapGuide.MaestroAPI.Capability
@@ -29,7 +29,7 @@
     /// the <see cref="T:OSGeo.MapGuide.MaestroAPI.IServerConnection"/> interface
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Check.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Check.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Check.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI
 {
@@ -40,18 +41,29 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="PreconditionException"/> class.
         /// </summary>
-        public PreconditionException() { }
+        public PreconditionException()
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PreconditionException"/> class.
         /// </summary>
         /// <param name="message">The message.</param>
-        public PreconditionException(string message) : base(message) { }
+        public PreconditionException(string message)
+            : base(message)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PreconditionException"/> class.
         /// </summary>
         /// <param name="message">The message.</param>
         /// <param name="inner">The inner.</param>
-        public PreconditionException(string message, Exception inner) : base(message, inner) { }
+        public PreconditionException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="PreconditionException"/> class.
         /// </summary>
@@ -102,7 +114,7 @@
         /// </summary>
         /// <param name="value"></param>
         /// <param name="arg"></param>
-        public static void NotEmpty(string value, string arg) 
+        public static void NotEmpty(string value, string arg)
         {
             if (string.IsNullOrEmpty(value))
                 throw new PreconditionException(Strings.PrecondStringEmpty + arg);
@@ -150,4 +162,4 @@
                 throw new ArgumentException(string.Format(Strings.NotAFolder, folderid), name);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/CommandType.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/CommandType.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/CommandType.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Commands
 {
     /// <summary>
@@ -32,37 +31,45 @@
         /// Gets a collection of resource content in a single batch
         /// </summary>
         GetResourceContents,
+
         /// <summary>
         /// Applies a feature schema to a feature source
         /// </summary>
         ApplySchema,
+
         /// <summary>
         /// Inserts a feature into a feature source
         /// </summary>
         InsertFeature,
+
         /// <summary>
         /// Updates features in a feature source
         /// </summary>
         UpdateFeatures,
+
         /// <summary>
         /// Deletes features from a feature source
         /// </summary>
         DeleteFeatures,
+
         /// <summary>
         /// Creates a data store on a feature source
         /// </summary>
         CreateDataStore,
+
         /// <summary>
         /// Retrieves information about cached FDO connections
         /// </summary>
         GetFdoCacheInfo,
+
         /// <summary>
         /// Creates a new Runtime Map and describe its structure
         /// </summary>
         CreateRuntimeMap,
+
         /// <summary>
         /// Describes the structure of an existing runtime map
         /// </summary>
         DescribeRuntimeMap
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/CreateRuntimeMap.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/CreateRuntimeMap.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/CreateRuntimeMap.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.RuntimeMap;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.Commands
 {
@@ -85,19 +84,22 @@
         /// No features
         /// </summary>
         None = 0,
+
         /// <summary>
         /// Include layer and group structure
         /// </summary>
         LayersAndGroups = 1,
+
         /// <summary>
         /// Include inline icons for each layer. Does nothing if <see cref="E:OSGeo.MapGuide.MaestroAPI.Commands.RuntimeMapRequest.LayersAndGroups"/>
         /// is not included in the mask
         /// </summary>
         Icons = 2,
+
         /// <summary>
         /// Include feature source information for each layer. Does nothing if <see cref="E:OSGeo.MapGuide.MaestroAPI.Commands.RuntimeMapRequest.LayersAndGroups"/>
         /// is not included in the mask
         /// </summary>
         FeatureSourceInformation = 4
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/DescribeRuntimeMap.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/DescribeRuntimeMap.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/DescribeRuntimeMap.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.RuntimeMap;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.Commands
 {
@@ -66,4 +65,4 @@
         /// <returns>The structure of the runtime map</returns>
         IRuntimeMapInfo Execute();
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/ExecuteLoadProcedure.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/ExecuteLoadProcedure.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/ExecuteLoadProcedure.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,36 +1,36 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.Common;
+using OSGeo.MapGuide.ObjectModels.DrawingSource;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels.LoadProcedure;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.MaestroAPI.Schema;
+using System;
+using System.Collections.Generic;
 using System.Collections.Specialized;
-using OSGeo.MapGuide.ObjectModels.DrawingSource;
 
 namespace OSGeo.MapGuide.MaestroAPI.Commands
 {
@@ -46,6 +46,7 @@
         /// <param name="callback">The callback.</param>
         /// <returns></returns>
         string[] Execute(ILoadProcedure loadProc, OSGeo.MapGuide.MaestroAPI.LengthyOperationProgressCallBack callback);
+
         /// <summary>
         /// Executes the specified resource ID.
         /// </summary>
@@ -53,6 +54,7 @@
         /// <param name="callback">The callback.</param>
         /// <returns></returns>
         string[] Execute(string resourceID, OSGeo.MapGuide.MaestroAPI.LengthyOperationProgressCallBack callback);
+
         /// <summary>
         /// Gets or sets a value indicating whether [ignore unsupported features].
         /// </summary>
@@ -143,11 +145,10 @@
             if (cb == null)
                 cb = delegate { };
 
-
             //bool loadProcedureUpdated = false;
             //bool updateGeneratedResourceIds = false;
 
-            //TODO: SDF and SHP load procedures share lots of common logic. Merge the two 
+            //TODO: SDF and SHP load procedures share lots of common logic. Merge the two
             //once everything's all good.
 
             var type = proc.SubType.Type;
@@ -814,4 +815,4 @@
             return resCreatedOrUpdated.ToArray();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/FeatureManipulationCommandImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/FeatureManipulationCommandImpl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/FeatureManipulationCommandImpl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Feature;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Feature;
 
 namespace OSGeo.MapGuide.MaestroAPI.Commands
 {
@@ -28,7 +29,7 @@
     /// A default implementation of <see cref="T:OSGeo.MapGuide.MaestroAPI.Commands.ICommand"/>. This class is reserved for connection provider use
     /// </summary>
     /// <typeparam name="TConn">The type of the conn.</typeparam>
-    public abstract class DefaultCommand<TConn> : ICommand where TConn : IServerConnection 
+    public abstract class DefaultCommand<TConn> : ICommand where TConn : IServerConnection
     {
         /// <summary>
         /// Gets the connection implementation.
@@ -76,7 +77,10 @@
         /// Initializes a new instance of the <see cref="DefaultFeatureCommand<TConn>"/> class.
         /// </summary>
         /// <param name="conn">The conn.</param>
-        protected DefaultFeatureCommand(TConn conn) : base(conn) { }
+        protected DefaultFeatureCommand(TConn conn)
+            : base(conn)
+        {
+        }
 
         /// <summary>
         /// Gets or sets the feature source id.
@@ -125,7 +129,10 @@
         /// Initializes a new instance of the
         /// </summary>
         /// <param name="conn">The conn.</param>
-        protected DefaultInsertCommand(TConn conn) : base(conn) { }
+        protected DefaultInsertCommand(TConn conn)
+            : base(conn)
+        {
+        }
 
         /// <summary>
         /// Gets or sets the record to insert.
@@ -157,7 +164,7 @@
                 if (this.RecordToInsert == null)
                     throw new InvalidOperationException(Strings.ErrorNothingToInsert);
 
-                this.ExecuteInternal(); 
+                this.ExecuteInternal();
             }
             catch (Exception ex)
             {
@@ -177,7 +184,10 @@
         /// Initializes a new instance of the <see cref="DefaultUpdateCommand<TConn>"/> class.
         /// </summary>
         /// <param name="parent">The parent.</param>
-        public DefaultUpdateCommand(TConn parent) : base(parent) { }
+        public DefaultUpdateCommand(TConn parent)
+            : base(parent)
+        {
+        }
 
         /// <summary>
         /// Gets or sets the filter.
@@ -227,13 +237,16 @@
     /// A default implementation of <see cref="T:OSGeo.MapGuide.MaestroAPI.Commands.IDeleteFeatures"/>. This class is reserved for connection provider use
     /// </summary>
     /// <typeparam name="TConn">The type of the conn.</typeparam>
-    public abstract class DefaultDeleteCommand<TConn> : DefaultFeatureCommand<TConn>, IDeleteFeatures where TConn : IServerConnection 
+    public abstract class DefaultDeleteCommand<TConn> : DefaultFeatureCommand<TConn>, IDeleteFeatures where TConn : IServerConnection
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DefaultDeleteCommand<TConn>"/> class.
         /// </summary>
         /// <param name="conn">The conn.</param>
-        protected DefaultDeleteCommand(TConn conn) : base(conn) { }
+        protected DefaultDeleteCommand(TConn conn)
+            : base(conn)
+        {
+        }
 
         /// <summary>
         /// Gets or sets the filter.
@@ -274,7 +287,10 @@
         /// Initializes a new instance of the <see cref="DefaultApplySchemaCommand<TConn>"/> class.
         /// </summary>
         /// <param name="conn">The conn.</param>
-        protected DefaultApplySchemaCommand(TConn conn) : base(conn) { }
+        protected DefaultApplySchemaCommand(TConn conn)
+            : base(conn)
+        {
+        }
 
         /// <summary>
         /// Gets or sets the schema.
@@ -318,7 +334,10 @@
         /// Initializes a new instance of the <see cref="DefaultCreateDataStoreCommand<TConn>"/> class.
         /// </summary>
         /// <param name="conn">The conn.</param>
-        protected DefaultCreateDataStoreCommand(TConn conn) : base(conn) { }
+        protected DefaultCreateDataStoreCommand(TConn conn)
+            : base(conn)
+        {
+        }
 
         /// <summary>
         /// Gets or sets the schema.
@@ -491,9 +510,9 @@
             get;
             set;
         }
-        
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="doc"></param>
         /// <param name="currentNode"></param>
@@ -503,7 +522,7 @@
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="node"></param>
         /// <param name="mgr"></param>
@@ -512,4 +531,4 @@
             throw new NotImplementedException();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/FeatureManipulationCommands.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/FeatureManipulationCommands.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/FeatureManipulationCommands.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,37 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Feature;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.ObjectModels.Common;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.MaestroAPI.Feature;
-using OSGeo.MapGuide.ObjectModels.Common;
 
 namespace OSGeo.MapGuide.MaestroAPI.Commands
 {
     /// <summary>
     /// Defines a command that works against a Feature Class of a Feature Source
     /// </summary>
-    public interface IFeatureCommand : ICommand 
+    public interface IFeatureCommand : ICommand
     {
         /// <summary>
         /// Gets or sets the Feature Source ID
@@ -52,12 +54,12 @@
     /// <example>
     /// How to create a data store with a given schema
     /// <code>
-    /// 
+    ///
     ///     IServerConnection conn = ...;
-    /// 
+    ///
     ///     FeatureSchema schema = new FeatureSchema("Default", "");
     ///     ClassDefinition cls = new ClassDefinition("MyClass", "");
-    ///     
+    ///
     ///     cls.DefaultGeometryProperty = "GEOM";
     ///     //Add identity property KEY
     ///     cls.AddProperty(new DataPropertyDefinition("KEY", "")
@@ -81,9 +83,9 @@
     ///         GeometricTypes = FeatureGeometricType.Point,
     ///         SpatialContextAssociation = "Default"
     ///     });
-    ///     
+    ///
     ///     schema.AddClass(cls);
-    ///     
+    ///
     ///     ICreateDataStore create = (ICreateDataStore)conn.CreateCommand((int)CommandType.CreateDataStore);
     ///     CoordinateSystemDefinitionBase coordSys = conn.CoordinateSystemCatalog.FindCoordSys("LL84");
     ///     create.FeatureSourceId = fsId;
@@ -96,7 +98,7 @@
     ///     create.XYTolerance = 0.001;
     ///     create.ZTolerance = 0.001;
     ///     create.Execute();
-    /// 
+    ///
     /// </code>
     /// </example>
     public interface ICreateDataStore : ICommand, IFdoSpatialContext
@@ -137,7 +139,7 @@
     /// <example>
     /// How to insert a feature that contains a string and geometry value
     /// <code>
-    /// 
+    ///
     ///     IServerConnection conn = ...;
     ///     IInsertFeatures insertCmd = (IInsertFeatures)conn.CreateCommand((int)CommandType.InsertFeatures);
     ///     insertCmd.FeatureSourceId = "Library://My.FeatureSource";
@@ -148,7 +150,7 @@
     ///     insertRec.PutValue("Name", new StringValue("Foo"));
     ///     insertCmd.RecordToInsert = insertRec;
     ///     InsertResult res = insertCmd.Execute();
-    /// 
+    ///
     /// </code>
     /// </example>
     public interface IInsertFeatures : IFeatureCommand
@@ -157,7 +159,7 @@
         /// The feature to insert
         /// </summary>
         IMutableRecord RecordToInsert { get; set; }
-        
+
         /// <summary>
         /// Executes the command. Any error during execution will be caught and stored in the <see cref="P:OSGeo.MapGuide.MaestroAPI.Commands.InsertResult.Error"/> property
         /// </summary>
@@ -199,7 +201,7 @@
         /// Executes the command.
         /// </summary>
         /// <returns>
-        /// A collection of <see cref="T:OSGeo.MapGuide.MaestroAPI.Commands.InsertResult" /> instances. 
+        /// A collection of <see cref="T:OSGeo.MapGuide.MaestroAPI.Commands.InsertResult" /> instances.
         /// Inspect the individual <see cref="P:OSGeo.MapGuide.MaestroAPI.Commands.InsertResult "/> properties to
         /// determine which features failed to be inserted.
         /// </returns>
@@ -216,7 +218,7 @@
     /// <example>
     /// How to update all features matching a given filter to the given value
     /// <code>
-    /// 
+    ///
     ///     IServerConnection conn = ...;
     ///     IUpdateFeatures updateCmd = (IUpdateFeatures)conn.CreateCommand((int)CommandType.UpdateFeatures);
     ///     updateCmd.FeatureSourceId = "Library://My.FeatureSource";
@@ -225,7 +227,7 @@
     ///     updateCmd.ValuesToUpdate = new MutableRecord();
     ///     updateCmd.ValuesToUpdate.PutValue("Name", new StringValue("Foo"));
     ///     int updated = updateCmd.Execute();
-    /// 
+    ///
     /// </code>
     /// </example>
     public interface IUpdateFeatures : IFeatureCommand
@@ -258,14 +260,14 @@
     /// <example>
     /// How to update all features matching a given filter to the given value
     /// <code>
-    /// 
+    ///
     ///     IServerConnection conn = ...;
     ///     IDeleteFeatures deleteCmd = (IDeleteFeatures)conn.CreateCommand((int)CommandType.DeleteFeatures);
     ///     deleteCmd.FeatureSourceId = "Library://My.FeatureSource";
     ///     deleteCmd.ClassName = "MyFeatureClass";
     ///     deleteCmd.Filter = "Name = 'Bar'";
     ///     int deleted = deleteCmd.Execute();
-    /// 
+    ///
     /// </code>
     /// </example>
     public interface IDeleteFeatures : IFeatureCommand
@@ -306,4 +308,4 @@
         /// </summary>
         void Execute();
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/ICommand.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/ICommand.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/ICommand.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Commands
 {
     /// <summary>
@@ -34,4 +33,4 @@
         /// <value>The parent connection.</value>
         IServerConnection Parent { get; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/IGetFdoCacheInfo.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/IGetFdoCacheInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/IGetFdoCacheInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml.Serialization;
 using System.ComponentModel;
+using System.Xml.Serialization;
 
 namespace OSGeo.MapGuide.MaestroAPI.Commands
 {
@@ -81,7 +82,6 @@
         [XmlElement]
         public DateTime TimeStamp { get; set; }
 
-
         /// <summary>
         /// Gets the configuration settings
         /// </summary>
@@ -92,7 +92,6 @@
         [DisplayName("Configuration Settings")] //NOXLATE
         public ConfigurationSettings Configuration { get; set; }
 
-
         /// <summary>
         /// Gets an array of cache status of connections for each provider
         /// </summary>
@@ -107,7 +106,6 @@
     [Serializable]
     public class CachedFdoConnection
     {
-
         /// <summary>
         /// Gets the feature source
         /// </summary>
@@ -165,7 +163,7 @@
         public string FeatureSourceId { get; set; }
 
         /// <summary>
-        /// Gets the maximum connection pool size 
+        /// Gets the maximum connection pool size
         /// </summary>
         [XmlElement]
         public int MaximumDataConnectionPoolSize { get; set; }
@@ -238,4 +236,4 @@
         [XmlElement]
         public int DataConnectionTimeout { get; set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/IGetResourceContents.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/IGetResourceContents.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/IGetResourceContents.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 
 namespace OSGeo.MapGuide.MaestroAPI.Commands
 {
@@ -56,4 +57,4 @@
         /// <returns></returns>
         Dictionary<string, IResource> Execute(IEnumerable<string> resourceIds);
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace OSGeo.MapGuide.MaestroAPI.Commands
@@ -29,7 +29,7 @@
     /// implementation of the <see cref="T:OSGeo.MapGuide.MaestroAPI.IServerConnection"/> interface
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ConnectionProviderRegistry.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ConnectionProviderRegistry.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ConnectionProviderRegistry.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.Text;
-using System.Xml;
-using System.Reflection;
 using System.Collections.Specialized;
 using System.Data.Common;
+using System.Reflection;
+using System.Xml;
 
 namespace OSGeo.MapGuide.MaestroAPI
 {
@@ -37,11 +39,13 @@
         /// </summary>
         /// <value>The name.</value>
         public string Name { get; private set; }
+
         /// <summary>
         /// Gets or sets the description.
         /// </summary>
         /// <value>The description.</value>
         public string Description { get; private set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether this instance is multi platform.
         /// </summary>
@@ -49,12 +53,14 @@
         /// 	<c>true</c> if this instance is multi platform; otherwise, <c>false</c>.
         /// </value>
         public bool IsMultiPlatform { get; private set; }
+
         /// <summary>
         /// Gets whether this provider has global connection state. This effectively indicates that subsequent connections after the first one
         /// created for this provider will re-use the same connection information and may/will disregard that values of the connection parameters
         /// you pass in
         /// </summary>
         public bool HasGlobalState { get; private set; }
+
         /// <summary>
         /// Gets the path of the assembly containing the provider implementation
         /// </summary>
@@ -100,7 +106,7 @@
     ///     <item><description>The name of this <see cref="IServerConnection"/> implementation</description></item>
     /// </list>
     /// <para>
-    /// The <see cref="IServerConnection"/> implementation is expected to have a non-public constructor which takes a single parameter, 
+    /// The <see cref="IServerConnection"/> implementation is expected to have a non-public constructor which takes a single parameter,
     /// a <see cref="System.Collections.Specialized.NameValueCollection"/> containing the initialization parameters parsed from the given connection
     /// string.
     /// </para>
@@ -109,23 +115,23 @@
     /// This example shows how to create a http-based MapGuide Server connection to the server's mapagent interface.
     /// <code>
     /// using OSGeo.MapGuide.MaestroAPI;
-    /// 
+    ///
     /// ...
-    /// 
+    ///
     /// IServerConnection conn = ConnectionProviderRegistry.CreateConnection("Maestro.Http",
     ///     "Url", "http://localhost/mapguide/mapagent/mapagent.fcgi",
     ///     "Username", "Administrator",
     ///     "Password", "admin");
-    /// 
+    ///
     /// </code>
     /// </example>
     /// <example>
     /// This example shows how to create a TCP/IP connection that wraps the official MapGuide API
     /// <code>
     /// using OSGeo.MapGuide.MaestroAPI;
-    /// 
+    ///
     /// ...
-    /// 
+    ///
     /// IServerConnection conn = ConnectionProviderRegistry.CreateConnection("Maestro.LocalNative",
     ///     "ConfigFile", "webconfig.ini",
     ///     "Username", "Administrator",
@@ -134,13 +140,13 @@
     /// </example>
     public sealed class ConnectionProviderRegistry
     {
-        const string PROVIDER_CONFIG = "ConnectionProviders.xml"; //NOXLATE
+        private const string PROVIDER_CONFIG = "ConnectionProviders.xml"; //NOXLATE
 
-        static Dictionary<string, ConnectionFactoryMethod> _ctors;
-        static List<ConnectionProviderEntry> _providers;
-        static Dictionary<string, int> _callCount;
+        private static Dictionary<string, ConnectionFactoryMethod> _ctors;
+        private static List<ConnectionProviderEntry> _providers;
+        private static Dictionary<string, int> _callCount;
 
-        static string _dllRoot;
+        private static string _dllRoot;
 
         static ConnectionProviderRegistry()
         {
@@ -188,7 +194,6 @@
                 }
                 catch
                 {
-
                 }
             }
         }
@@ -261,16 +266,16 @@
         /// <param name="connectionString"></param>
         /// <remarks>
         /// The Maestro.Local provider (that wraps mg-desktop) and Maestro.LocalNative providers (that wraps the official MapGuide API)
-        /// are unique in that it has global connection state. What this means is that subsequent connections after the first one for 
-        /// these providers may re-use existing state for the first connection. The reason for this is that creating this connection 
-        /// internally calls MgdPlatform.Initialize(iniFile) and MapGuideApi.MgInitializeWebTier(iniFile) respectively, that initializes 
-        /// the necessary library parameters in the process space of your application. Creating another connection will call 
-        /// MgdPlatform.Initialize and MapGuideApi.MgInitializeWebTier again, but these methods are by-design only made to be called once 
+        /// are unique in that it has global connection state. What this means is that subsequent connections after the first one for
+        /// these providers may re-use existing state for the first connection. The reason for this is that creating this connection
+        /// internally calls MgdPlatform.Initialize(iniFile) and MapGuideApi.MgInitializeWebTier(iniFile) respectively, that initializes
+        /// the necessary library parameters in the process space of your application. Creating another connection will call
+        /// MgdPlatform.Initialize and MapGuideApi.MgInitializeWebTier again, but these methods are by-design only made to be called once
         /// as subsequent calls are returned immediately.
-        /// 
+        ///
         /// Basically, the connection parameters you pass in are for initializing the provider the first time round. Subsequent calls may not
-        /// (most likely will not) respect the values of your connection parameters. 
-        /// 
+        /// (most likely will not) respect the values of your connection parameters.
+        ///
         /// You can programmatically check this via the <see cref="P:OSGeo.MapGuide.MaestroAPI.ConnectionProviderEntry.HasGlobalState"/> property
         /// </remarks>
         /// <returns></returns>
@@ -358,4 +363,4 @@
             return null;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ConnectionProviders.xml
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ConnectionProviders.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ConnectionProviders.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -12,7 +12,7 @@
         <Assembly>OSGeo.MapGuide.MaestroAPI.Rest.dll</Assembly>
         <Type>OSGeo.MapGuide.MaestroAPI.RestConnection</Type>
     </ConnectionProvider>
-    <!-- 
+    <!--
     If you want to use the Maestro.LocalNative provider, register the desired
     LocalNative provider assembly here.
     -->
@@ -24,4 +24,4 @@
         <Type>OSGeo.MapGuide.MaestroAPI.LocalNativeConnection</Type>
     </ConnectionProvider>
     -->
-</ConnectionProviderRegistry>
+</ConnectionProviderRegistry>
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ActualCoordinateSystem.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ActualCoordinateSystem.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ActualCoordinateSystem.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using GeoAPI.CoordinateSystems;
 using GeoAPI.CoordinateSystems.Transformations;
-using GeoAPI.CoordinateSystems;
+using GeoAPI.Geometries;
+using GisSharpBlog.NetTopologySuite.Geometries;
+using ProjNet.CoordinateSystems;
 using ProjNet.CoordinateSystems.Transformations;
-using ProjNet.CoordinateSystems;
-using GisSharpBlog.NetTopologySuite.Geometries;
-using GeoAPI.Geometries;
+using System;
 
 namespace OSGeo.MapGuide.MaestroAPI.CoordinateSystem
 {
@@ -69,4 +70,4 @@
 
         //public override Topology.CoordinateSystems.ICoordinateSystem CoordinateSystem { get { return m_transform.SourceCS; } }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystem.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystem.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystem.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.CoordinateSystem
 {
     /// <summary>
@@ -33,34 +31,42 @@
         /// The parent category
         /// </summary>
         protected CoordinateSystemCategory m_parent;
+
         /// <summary>
         /// The cs code
         /// </summary>
         protected string m_code;
+
         /// <summary>
         /// The description
         /// </summary>
         protected string m_description;
+
         /// <summary>
         /// The projection
         /// </summary>
         protected string m_projection;
+
         /// <summary>
         /// The projection description
         /// </summary>
         protected string m_projectionDescription;
+
         /// <summary>
         /// The datum
         /// </summary>
         protected string m_datum;
+
         /// <summary>
         /// The datum description
         /// </summary>
         protected string m_datumDescription;
+
         /// <summary>
         /// The ellipsoid
         /// </summary>
         protected string m_ellipsoid;
+
         /// <summary>
         /// The ellipsoid description
         /// </summary>
@@ -70,6 +76,7 @@
         /// The cs wkt
         /// </summary>
         protected string m_wkt = null;
+
         /// <summary>
         /// The epsg code
         /// </summary>
@@ -78,7 +85,9 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="CoordinateSystemBase"/> class.
         /// </summary>
-        protected CoordinateSystemDefinitionBase() { }
+        protected CoordinateSystemDefinitionBase()
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="CoordinateSystemBase"/> class.
@@ -102,45 +111,52 @@
         /// Gets or sets the code.
         /// </summary>
         /// <value>The code.</value>
-        public string Code 
-        { 
-            get { return m_code; } 
+        public string Code
+        {
+            get { return m_code; }
             set { m_code = value; }
         }
+
         /// <summary>
         /// Gets or sets the description.
         /// </summary>
         /// <value>The description.</value>
-        public string Description 
-        { 
-            get { return m_description; } 
+        public string Description
+        {
+            get { return m_description; }
             set { m_description = value; }
         }
+
         /// <summary>
         /// Gets the projection.
         /// </summary>
         /// <value>The projection.</value>
         public string Projection { get { return m_projection; } }
+
         /// <summary>
         /// Gets the projection description.
         /// </summary>
         /// <value>The projection description.</value>
         public string ProjectionDescription { get { return m_projectionDescription; } }
+
         /// <summary>
         /// Gets the datum.
         /// </summary>
         /// <value>The datum.</value>
         public string Datum { get { return m_datum; } }
+
         /// <summary>
         /// Gets the datum description.
         /// </summary>
         /// <value>The datum description.</value>
         public string DatumDescription { get { return m_datumDescription; } }
+
         /// <summary>
         /// Gets the ellipsoid.
         /// </summary>
         /// <value>The ellipsoid.</value>
         public string Ellipsoid { get { return m_ellipsoid; } }
+
         /// <summary>
         /// Gets the ellipsoid description.
         /// </summary>
@@ -151,9 +167,9 @@
         /// Gets or sets the WKT.
         /// </summary>
         /// <value>The WKT.</value>
-        public string WKT 
+        public string WKT
         {
-            get 
+            get
             {
                 if (m_wkt == null)
                     m_wkt = m_parent.Parent.ConvertCoordinateSystemCodeToWkt(m_code);
@@ -169,9 +185,9 @@
         /// Gets the EPSG code
         /// </summary>
         /// <value>The EPSG code.</value>
-        public string EPSG 
+        public string EPSG
         {
-            get 
+            get
             {
                 if (m_epsg == null)
                     if (m_code.StartsWith("EPSG:")) //NOXLATE
@@ -201,4 +217,4 @@
                 return m_description + " (" + m_code + ")"; //NOXLATE
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemBase.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemBase.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using GeoAPI.CoordinateSystems;
+using GeoAPI.Geometries;
+using GisSharpBlog.NetTopologySuite.Geometries;
 using ProjNet.CoordinateSystems;
-using GeoAPI.Geometries;
 using ObjCommon = OSGeo.MapGuide.ObjectModels.Common;
-using GisSharpBlog.NetTopologySuite.Geometries;
 
 namespace OSGeo.MapGuide.MaestroAPI.CoordinateSystem
 {
@@ -33,7 +33,7 @@
     /// </summary>
     internal abstract class CoordinateSystemBase
     {
-        static ICoordinateSystemFactory _csFact;
+        private static ICoordinateSystemFactory _csFact;
 
         static CoordinateSystemBase()
         {
@@ -45,7 +45,7 @@
             Check.NotNull(csDef, "csDef");
             return Create(csDef.WKT);
         }
-        
+
         public static CoordinateSystemBase Create(string csWkt)
         {
             Check.NotEmpty(csWkt, "csWkt");
@@ -73,7 +73,7 @@
                 else if (unit is ILinearUnit)
                     csb = new MeterBasedCoordinateSystem(((ILinearUnit)unit).MetersPerUnit, ((ILinearUnit)unit).MetersPerUnit);
             }
-            
+
             if (csb == null)
                 csb = new MeterBasedCoordinateSystem();
 
@@ -105,7 +105,7 @@
         protected abstract double CalculateScale(IEnvelope bbox, System.Drawing.Size size);
 
         /// <summary>
-        /// Adjusts the boundingbox to equal proportions 
+        /// Adjusts the boundingbox to equal proportions
         /// </summary>
         /// <param name="bbox">The actual bounding box</param>
         /// <param name="scale">The scale to fit</param>
@@ -119,7 +119,7 @@
         }
 
         /// <summary>
-        /// Adjusts the boundingbox to equal proportions 
+        /// Adjusts the boundingbox to equal proportions
         /// </summary>
         /// <param name="bbox">The actual bounding box</param>
         /// <param name="scale">The scale to fit</param>
@@ -150,4 +150,4 @@
         /// <returns>The distance in meters</returns>
         protected abstract double DistanceInMeters(IPoint p1, IPoint p2);
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemCatalog.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemCatalog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemCatalog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
+//
+
+#endregion Disclaimer / License
+
 using System.Collections.Generic;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.CoordinateSystem
 {
@@ -150,4 +151,4 @@
             return new DefaultSimpleTransform(sourceWkt, targetWkt);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemCategory.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemCategory.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/CoordinateSystemCategory.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.CoordinateSystem
 {
     /// <summary>
@@ -29,7 +28,7 @@
     public abstract class CoordinateSystemCategory
     {
         private ICoordinateSystemCatalog _parent;
-		private string m_name;
+        private string m_name;
         private CoordinateSystemDefinitionBase[] m_items;
 
         /// <summary>
@@ -38,36 +37,36 @@
         /// <param name="parent">The parent.</param>
         /// <param name="name">The name.</param>
         protected CoordinateSystemCategory(ICoordinateSystemCatalog parent, string name)
-		{
-			m_name = name;
-			_parent = parent;
-		}
+        {
+            m_name = name;
+            _parent = parent;
+        }
 
         /// <summary>
         /// Gets the name.
         /// </summary>
         /// <value>The name.</value>
-		public string Name { get { return m_name; } }
+        public string Name { get { return m_name; } }
 
         internal ICoordinateSystemCatalog Parent { get { return _parent; } }
 
         /// <summary>
         /// Gets an array of all coordinate systems in this category
         /// </summary>
-		public CoordinateSystemDefinitionBase[] Items
-		{
-			get
-			{
-				if (m_items == null)
-				{
+        public CoordinateSystemDefinitionBase[] Items
+        {
+            get
+            {
+                if (m_items == null)
+                {
                     if (_parent != null)
                     {
                         m_items = _parent.EnumerateCoordinateSystems(m_name);
                     }
-				}
-				return m_items;
-			}
-		}
+                }
+                return m_items;
+            }
+        }
 
         /// <summary>
         /// Returns a <see cref="System.String"/> that represents this instance.
@@ -75,9 +74,9 @@
         /// <returns>
         /// A <see cref="System.String"/> that represents this instance.
         /// </returns>
-		public override string ToString()
-		{
-			return m_name;
-		}
+        public override string ToString()
+        {
+            return m_name;
+        }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/DegreeBasedCoordinateSystem.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/DegreeBasedCoordinateSystem.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/DegreeBasedCoordinateSystem.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.CoordinateSystem
 {
     internal class DegreeBasedCoordinateSystem : MeterBasedCoordinateSystem
@@ -30,4 +29,4 @@
         {
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/FeetBasedCoordinateSystem.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/FeetBasedCoordinateSystem.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/FeetBasedCoordinateSystem.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.CoordinateSystem
 {
     internal class FeetBasedCoordinateSystem : MeterBasedCoordinateSystem
@@ -28,7 +27,6 @@
         internal FeetBasedCoordinateSystem()
             : base(0.3048, 0.3048)
         {
-
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ICoordinateSystemCatalog.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ICoordinateSystemCatalog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ICoordinateSystemCatalog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,23 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
-using System;
+//
+
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.CoordinateSystem
 {
     /// <summary>
@@ -36,12 +38,12 @@
     /// CoordinateSystemDefinitionBase dstCs = csCatalog.FindCoordSys("WGS84.PseudoMercator");
     /// //Create the transform using the WKTs of the source and target coordinate system definitions
     /// ISimpleTransform trans = csCatalog.CreateTransform(srcCs.WKT, dstCs.WKT);
-    /// 
+    ///
     /// double x = -71.061342;
     /// double y = 42.355892;
     /// double tx;
     /// double ty;
-    /// 
+    ///
     /// trans.Transform(x, y, out tx, out ty);
     /// //tx and ty will contain the transformed coordinates
     /// ]]>
@@ -86,7 +88,7 @@
         /// Gets an array of all coordinate systems in this catalog
         /// </summary>
         CoordinateSystemDefinitionBase[] Coordsys { get; }
-        
+
         /// <summary>
         /// Gets an array of all coordinate systems in the specified category
         /// </summary>
@@ -100,7 +102,7 @@
         /// <param name="coordcode"></param>
         /// <returns></returns>
         CoordinateSystemDefinitionBase FindCoordSys(string coordcode);
-        
+
         /// <summary>
         /// Gets an empty coordinate system
         /// </summary>
@@ -113,12 +115,12 @@
         /// <param name="wkt"></param>
         /// <returns></returns>
         bool IsValid(string wkt);
-        
+
         /// <summary>
         /// Gets the name of the coordinate system library
         /// </summary>
         string LibraryName { get; }
-        
+
         /// <summary>
         /// Gets whether the coordinate system catalog has been loaded
         /// </summary>
@@ -132,4 +134,4 @@
         /// <returns></returns>
         ISimpleTransform CreateTransform(string sourceWkt, string targetWkt);
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ISimpleTransform.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ISimpleTransform.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/ISimpleTransform.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using GeoAPI.CoordinateSystems;
 using GeoAPI.CoordinateSystems.Transformations;
 using ProjNet.CoordinateSystems;
 using ProjNet.CoordinateSystems.Transformations;
+using System;
 
 namespace OSGeo.MapGuide.MaestroAPI.CoordinateSystem
 {
@@ -51,14 +52,14 @@
         private ICoordinateSystem _target;
         private ICoordinateTransformation _trans;
 
-        const string CSMAP_WGS84_PSEUDO_MERCATOR = @"PROJCS[""WGS84.PseudoMercator"",GEOGCS[""LL84"",DATUM[""WGS84"",SPHEROID[""WGS84"",6378137.000,298.25722293]],PRIMEM[""Greenwich"",0],UNIT[""Degree"",0.017453292519943295]],PROJECTION[""Popular Visualisation Pseudo Mercator""],PARAMETER[""false_easting"",0.000],PARAMETER[""false_northing"",0.000],PARAMETER[""central_meridian"",0.00000000000000],UNIT[""Meter"",1.00000000000000]]"; //NOXLATE
+        private const string CSMAP_WGS84_PSEUDO_MERCATOR = @"PROJCS[""WGS84.PseudoMercator"",GEOGCS[""LL84"",DATUM[""WGS84"",SPHEROID[""WGS84"",6378137.000,298.25722293]],PRIMEM[""Greenwich"",0],UNIT[""Degree"",0.017453292519943295]],PROJECTION[""Popular Visualisation Pseudo Mercator""],PARAMETER[""false_easting"",0.000],PARAMETER[""false_northing"",0.000],PARAMETER[""central_meridian"",0.00000000000000],UNIT[""Meter"",1.00000000000000]]"; //NOXLATE
 
         // Proj.Net cannot handle the WGS84.PseudoMercator WKT. Here's an alternative WKT that is Proj.Net compatible and produces
         // approximately similar results:
         //
         // http://alastaira.wordpress.com/2011/01/23/the-google-maps-bing-maps-spherical-mercator-projection/
         //
-        const string POPULAR_VISUALISATION_CRS = 
+        private const string POPULAR_VISUALISATION_CRS =
 @"PROJCS[""Popular Visualisation CRS / Mercator"",
  GEOGCS[""Popular Visualisation CRS"",
   DATUM[""WGS84"",
@@ -106,7 +107,7 @@
             tx = Double.NaN;
             ty = Double.NaN;
 
-            double [] pts = _trans.MathTransform.Transform(new double[] { x, y });
+            double[] pts = _trans.MathTransform.Transform(new double[] { x, y });
             tx = pts[0];
             ty = pts[1];
         }
@@ -116,7 +117,6 @@
         /// </summary>
         public void Dispose()
         {
-            
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/MeterBasedCoordinateSystem.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/MeterBasedCoordinateSystem.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/MeterBasedCoordinateSystem.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using GeoAPI.Geometries;
+using GisSharpBlog.NetTopologySuite.Geometries;
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Drawing;
-using GeoAPI.Geometries;
-using GisSharpBlog.NetTopologySuite.Geometries;
 
 namespace OSGeo.MapGuide.MaestroAPI.CoordinateSystem
 {
@@ -36,9 +37,12 @@
 
         //Coordsys distance pr unit in meters, X/Y axis
         protected readonly double UDM_X = 1;
+
         protected readonly double UDM_Y = 1;
 
-        internal MeterBasedCoordinateSystem() { }
+        internal MeterBasedCoordinateSystem()
+        {
+        }
 
         internal MeterBasedCoordinateSystem(double meters_pr_x_unit, double meters_pr_y_unit)
             : this()
@@ -67,7 +71,7 @@
 
         protected override IEnvelope AdjustBoundingBox(IEnvelope bbox, double scale, Size size)
         {
-            double picture_width_in_meters = ((size.Width / DPI) / IPM) * scale; 
+            double picture_width_in_meters = ((size.Width / DPI) / IPM) * scale;
             double picture_height_in_meters = ((size.Height / DPI) / IPM) * scale;
 
             double width_extent = picture_width_in_meters / UDM_X;
@@ -81,7 +85,7 @@
             double xdist = Math.Abs(p1.X - p2.X);
             double ydist = Math.Abs(p1.Y - p2.Y);
 
-            return Math.Sqrt((xdist * xdist) + (ydist * ydist));            
+            return Math.Sqrt((xdist * xdist) + (ydist * ydist));
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CoordinateSystem/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace OSGeo.MapGuide.MaestroAPI.CoordinateSystem
@@ -29,7 +29,7 @@
     /// for working with Cooridinate Systems and basic coordinate system transformation.
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CredentialWriter.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CredentialWriter.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CredentialWriter.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Diagnostics;
 using System.IO;
+using System.Text;
 using ObjCommon = OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
 
 namespace OSGeo.MapGuide.MaestroAPI
 {
@@ -87,20 +88,20 @@
         //I'm sure this particular key isn't meant to be made public, but being able to correctly
         //write MG_USER_CREDENTIALS trumps this concern. Besides, if this key were to be truly private, it wouldn't be publicly visible
         //in the source code of a publicly accessible repository now would it?
-        const string MG_CRYPTOGRAPHY_PRIVATE_KEY         = "WutsokeedbA"; //NOXLATE
+        private const string MG_CRYPTOGRAPHY_PRIVATE_KEY = "WutsokeedbA"; //NOXLATE
 
-        static readonly char[] MG_CRYPTOGRAPHY_DEC_CHARS = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' }; //NOXLATE
-        static readonly char[] MG_CRYPTOGRAPHY_HEX_CHARS = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; //NOXLATE
-        const int MG_CRYPTOGRAPHY_MAGIC_NUMBER_1         = 42; //NOXLATE
-        const int MG_CRYPTOGRAPHY_MAGIC_NUMBER_2         = 3;
-        const int MG_CRYPTOGRAPHY_MIN_COLUMN_NUMBER      = 5;
+        private static readonly char[] MG_CRYPTOGRAPHY_DEC_CHARS = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' }; //NOXLATE
+        private static readonly char[] MG_CRYPTOGRAPHY_HEX_CHARS = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; //NOXLATE
+        private const int MG_CRYPTOGRAPHY_MAGIC_NUMBER_1 = 42; //NOXLATE
+        private const int MG_CRYPTOGRAPHY_MAGIC_NUMBER_2 = 3;
+        private const int MG_CRYPTOGRAPHY_MIN_COLUMN_NUMBER = 5;
 
-        const int MIN_CIPHER_TEXT_LENGTH = 34;
-        const int MIN_KEY_LENGTH = 14;
-        const int MAX_KEY_LENGTH = 32;
-        const string STRING_DELIMITER = "\v"; //NOXLATE
-        const string RESERVED_CHARACTERS_STRINGS = "\v\f"; //NOXLATE
-        const string RESERVED_CHARACTERS_CREDENTIALS = "\t\r\n\v\f"; //NOXLATE
+        private const int MIN_CIPHER_TEXT_LENGTH = 34;
+        private const int MIN_KEY_LENGTH = 14;
+        private const int MAX_KEY_LENGTH = 32;
+        private const string STRING_DELIMITER = "\v"; //NOXLATE
+        private const string RESERVED_CHARACTERS_STRINGS = "\v\f"; //NOXLATE
+        private const string RESERVED_CHARACTERS_CREDENTIALS = "\t\r\n\v\f"; //NOXLATE
 
         /// <summary>
         /// Encrypts the specified credentials. For a feature source that uses %MG_USERNAME% and %MG_PASSWORD% placeholder tokens to
@@ -117,7 +118,7 @@
             return new MemoryStream(ASCIIEncoding.Default.GetBytes(credentials));
         }
 
-        static void EncryptStrings(string plainText1, string plainText2, out string cipherText, string reservedCharacters)
+        private static void EncryptStrings(string plainText1, string plainText2, out string cipherText, string reservedCharacters)
         {
             var reservedChars = reservedCharacters.ToCharArray();
             if (plainText1.IndexOfAny(reservedChars) >= 0)
@@ -142,7 +143,7 @@
             EncryptStringByTransposition(tmpStr2, out cipherText);
         }
 
-        static void EncryptStringByTransposition(string inStr, out string outStr)
+        private static void EncryptStringByTransposition(string inStr, out string outStr)
         {
             string tmpStr;
             int inStrLength = inStr.Length;
@@ -155,7 +156,7 @@
             Debug.Assert(inStrLength == outStr.Length);
         }
 
-        static void EncryptStringByTransposition(string inStr, out string outStr, int numOfColumn)
+        private static void EncryptStringByTransposition(string inStr, out string outStr, int numOfColumn)
         {
             int inStrLen = inStr.Length;
             int numOfRow = (int)Math.Ceiling((double)inStrLen / (double)numOfColumn);
@@ -178,20 +179,20 @@
             outStr = sb.ToString();
         }
 
-        static void GenerateCryptographKey(out string publicKey)
+        private static void GenerateCryptographKey(out string publicKey)
         {
             DateTime dt = DateTime.UtcNow;
             publicKey = dt.ToString("yyyymmddHHmmss"); //NOXLATE
         }
 
-        static void CombineStrings(string str1, string str2, out string outStr)
+        private static void CombineStrings(string str1, string str2, out string outStr)
         {
             outStr = str1;
             outStr += STRING_DELIMITER;
             outStr += str2;
         }
 
-        static void EncryptStringWithKey(string inStr, out string outStr, string key)
+        private static void EncryptStringWithKey(string inStr, out string outStr, string key)
         {
             char prevChar = Convert.ToChar(MG_CRYPTOGRAPHY_MAGIC_NUMBER_1);
             char currChar;
@@ -211,15 +212,15 @@
 
                 if (keyIdx >= keyLen)
                 {
-                   keyIdx = 0;
+                    keyIdx = 0;
                 }
             }
 
             BinToHex(tmpStr.ToString(), out outStr);
-            Debug.Assert((inStr.Length * 2) == outStr.Length); 
+            Debug.Assert((inStr.Length * 2) == outStr.Length);
         }
 
-        static void BinToHex(string binStr, out string hexStr)
+        private static void BinToHex(string binStr, out string hexStr)
         {
             int binStrLen = binStr.Length;
 
@@ -241,4 +242,4 @@
             hexStr = sb.ToString();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace OSGeo.MapGuide.MaestroAPI.CrossConnection
@@ -29,7 +29,7 @@
     /// for working with multiple <see cref="T:OSGeo.MapGuide.MaestroAPI.IServerConnection"/> instances
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceMigrator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceMigrator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceMigrator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Resource.Conversion;
+using System.Collections.Generic;
 using System.IO;
 
 namespace OSGeo.MapGuide.MaestroAPI.CrossConnection
@@ -85,7 +86,7 @@
         }
 
         /// <summary>
-        /// Copies resource from the source connection to another connection. 
+        /// Copies resource from the source connection to another connection.
         /// </summary>
         /// <param name="sourceResourceIds">The array of source resource ids</param>
         /// <param name="targetResourceIds">The array of target resource ids to copy to. Each resource id in the source array will be copied to the corresponding resource id in the target array</param>
@@ -120,7 +121,7 @@
             {
                 var srcResId = sourceResourceIds[i];
                 var dstResId = targetResourceIds[i];
-                
+
                 //Get the source resource object
                 IResource res = _source.ResourceService.GetResource(srcResId);
 
@@ -467,7 +468,6 @@
                         }
                         catch //This happens if we're saving a resource to an older version where this resource version does not exist
                         {
-
                         }
 
                         progress += unit;
@@ -480,7 +480,7 @@
 
         /// <summary>
         /// Shortcut API to migrate a specific resource to the target connection. Dependent resources are automatically
-        /// migrated as well. This copies all dependent resources of the specified resource. 
+        /// migrated as well. This copies all dependent resources of the specified resource.
         /// </summary>
         /// <param name="resourceId">The id of the resource to migrate</param>
         /// <param name="overwrite">If true, all dependent resources that already exist in the target connection are overwritten, otherwise these are not copied over</param>
@@ -538,4 +538,4 @@
             get { return _target; }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceRebaser.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceRebaser.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceRebaser.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Resource;
+using System.IO;
 using System.Xml;
-using System.IO;
 
 namespace OSGeo.MapGuide.MaestroAPI.CrossConnection
 {
@@ -113,4 +113,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CsHelper.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CsHelper.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CsHelper.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI
 {
@@ -69,10 +68,10 @@
         {
             get { return sm_defaultCatalog; }
             set
-            { 
+            {
                 sm_defaultCatalog = value;
                 Debug.WriteLineIf((value != null), "Registered default CS catalog: " + value.GetType().ToString());
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Enums.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Enums.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Enums.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,22 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 
 namespace OSGeo.MapGuide.MaestroAPI
@@ -71,65 +74,78 @@
     /// <summary>
     /// Represents the common resource types in MapGuide
     /// </summary>
-	public enum ResourceTypes
-	{
+    public enum ResourceTypes
+    {
         /// <summary>
         /// Map Definition
         /// </summary>
-		MapDefinition,
+        MapDefinition,
+
         /// <summary>
         /// Layer Definition
         /// </summary>
-		LayerDefinition,
+        LayerDefinition,
+
         /// <summary>
         /// Feature Source
         /// </summary>
-		FeatureSource,
+        FeatureSource,
+
         /// <summary>
         /// Web Layout
         /// </summary>
-		WebLayout,
+        WebLayout,
+
         /// <summary>
         /// Runtime Map
         /// </summary>
-		RuntimeMap,
+        RuntimeMap,
+
         /// <summary>
         /// Folder
         /// </summary>
-		Folder,
+        Folder,
+
         /// <summary>
         /// Fusion Flexible Layout
         /// </summary>
-		ApplicationDefinition,
+        ApplicationDefinition,
+
         /// <summary>
         /// Print Layout
         /// </summary>
         PrintLayout,
+
         /// <summary>
         /// Symbol Definition
         /// </summary>
         SymbolDefinition,
+
         /// <summary>
         /// Load Procedure
         /// </summary>
         LoadProcedure,
+
         /// <summary>
         /// Drawing Source
         /// </summary>
         DrawingSource,
+
         /// <summary>
         /// DWF-based Symbol Library
         /// </summary>
         SymbolLibrary,
+
         /// <summary>
         /// A watermark
         /// </summary>
         WatermarkDefinition,
+
         /// <summary>
         /// A selection for a runtime map
         /// </summary>
         Selection
-	}
+    }
 
     /// <summary>
     /// Represents a method involving a resource id
@@ -147,7 +163,10 @@
         /// Constructor
         /// </summary>
         /// <param name="resourceID"></param>
-        public ResourceEventArgs(string resourceID) { this.ResourceID = resourceID; }
+        public ResourceEventArgs(string resourceID)
+        {
+            this.ResourceID = resourceID;
+        }
 
         /// <summary>
         /// Gets or sets the resource id
@@ -178,9 +197,9 @@
         }
     }
 
-	internal class EnumHelper
-	{
-		private static string[] ResourceTypeNames = new string[]
+    internal class EnumHelper
+    {
+        private static string[] ResourceTypeNames = new string[]
 		{
 			"MapDefinition", //NOXLATE
 			"LayerDefinition", //NOXLATE
@@ -191,68 +210,74 @@
 			"ApplicationDefinition", //NOXLATE
 		};
 
-		internal static string ResourceName(ResourceTypes type)
-		{
-			return ResourceName(type, false);
-		}
+        internal static string ResourceName(ResourceTypes type)
+        {
+            return ResourceName(type, false);
+        }
 
-		internal static string ResourceName(ResourceTypes type, bool prefixWithDot)
-		{
-				if (type == ResourceTypes.Folder || !prefixWithDot)
-					return ResourceTypeNames[(int)type];
-				else
-                    return "." + ResourceTypeNames[(int)type]; //NOXLATE
-		}
+        internal static string ResourceName(ResourceTypes type, bool prefixWithDot)
+        {
+            if (type == ResourceTypes.Folder || !prefixWithDot)
+                return ResourceTypeNames[(int)type];
+            else
+                return "." + ResourceTypeNames[(int)type]; //NOXLATE
+        }
+    }
 
-	}
-
     /// <summary>
     /// Flags that can be used for the QueryMapFeatures operation
     /// </summary>
-	public enum QueryMapFeaturesLayerAttributes : int
-	{
+    public enum QueryMapFeaturesLayerAttributes : int
+    {
         /// <summary>
         /// All layers
         /// </summary>
-		AllLayers = 0,
+        AllLayers = 0,
+
         /// <summary>
         /// Only visible
         /// </summary>
-		OnlyVisible = 1,
+        OnlyVisible = 1,
+
         /// <summary>
         /// Only selectable
         /// </summary>
-		OnlySelectable = 2,
+        OnlySelectable = 2,
+
         /// <summary>
         /// Default
         /// </summary>
-		Default = 3,
+        Default = 3,
+
         /// <summary>
         /// Only with tooltips
         /// </summary>
-		OnlyWithToolTips = 4,
+        OnlyWithToolTips = 4,
+
         /// <summary>
         /// Visible with tooltips
         /// </summary>
-		VisibleWithToolTips = 5
-	}
+        VisibleWithToolTips = 5
+    }
 
     /// <summary>
     /// Defines the types of unmananged data
     /// </summary>
-	public enum UnmanagedDataTypes : int
-	{
+    public enum UnmanagedDataTypes : int
+    {
         /// <summary>
         /// Files
         /// </summary>
-		Files,
+        Files,
+
         /// <summary>
         /// Folders
         /// </summary>
-		Folders,
+        Folders,
+
         /// <summary>
         /// Files and Folders
         /// </summary>
-		Both
-	}
-}
+        Both
+    }
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/CustomPropertyNotFoundException.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/CustomPropertyNotFoundException.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/CustomPropertyNotFoundException.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.Exceptions
 {
@@ -40,18 +41,29 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="CustomPropertyNotFoundException"/> class.
         /// </summary>
-        public CustomPropertyNotFoundException() { }
+        public CustomPropertyNotFoundException()
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="CustomPropertyNotFoundException"/> class.
         /// </summary>
         /// <param name="message">The message.</param>
-        public CustomPropertyNotFoundException(string message) : base(message) { }
+        public CustomPropertyNotFoundException(string message)
+            : base(message)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="CustomPropertyNotFoundException"/> class.
         /// </summary>
         /// <param name="message">The message.</param>
         /// <param name="inner">The inner.</param>
-        public CustomPropertyNotFoundException(string message, Exception inner) : base(message, inner) { }
+        public CustomPropertyNotFoundException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="CustomPropertyNotFoundException"/> class.
         /// </summary>
@@ -68,4 +80,4 @@
           System.Runtime.Serialization.StreamingContext context)
             : base(info, context) { }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/DuplicateKeyException.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/DuplicateKeyException.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/DuplicateKeyException.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.Exceptions
 {
@@ -39,18 +40,29 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="DuplicateKeyException"/> class.
         /// </summary>
-        public DuplicateKeyException() { }
+        public DuplicateKeyException()
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="DuplicateKeyException"/> class.
         /// </summary>
         /// <param name="message">The message.</param>
-        public DuplicateKeyException(string message) : base(message) { }
+        public DuplicateKeyException(string message)
+            : base(message)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="DuplicateKeyException"/> class.
         /// </summary>
         /// <param name="message">The message.</param>
         /// <param name="inner">The inner.</param>
-        public DuplicateKeyException(string message, Exception inner) : base(message, inner) { }
+        public DuplicateKeyException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="DuplicateKeyException"/> class.
         /// </summary>
@@ -59,7 +71,7 @@
         /// <exception cref="T:System.ArgumentNullException">
         /// The <paramref name="info"/> parameter is null.
         ///   </exception>
-        ///   
+        ///
         /// <exception cref="T:System.Runtime.Serialization.SerializationException">
         /// The class name is null or <see cref="P:System.Exception.HResult"/> is zero (0).
         ///   </exception>
@@ -68,4 +80,4 @@
           System.Runtime.Serialization.StreamingContext context)
             : base(info, context) { }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/ExpressionException.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/ExpressionException.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/ExpressionException.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.Exceptions
 {
@@ -39,18 +40,29 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="ExpressionException"/> class.
         /// </summary>
-        public ExpressionException() { }
+        public ExpressionException()
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ExpressionException"/> class.
         /// </summary>
         /// <param name="message">The message.</param>
-        public ExpressionException(string message) : base(message) { }
+        public ExpressionException(string message)
+            : base(message)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ExpressionException"/> class.
         /// </summary>
         /// <param name="message">The message.</param>
         /// <param name="inner">The inner.</param>
-        public ExpressionException(string message, Exception inner) : base(message, inner) { }
+        public ExpressionException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ExpressionException"/> class.
         /// </summary>
@@ -67,4 +79,4 @@
           System.Runtime.Serialization.StreamingContext context)
             : base(info, context) { }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/MaestroException.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/MaestroException.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/MaestroException.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.Exceptions
 {
@@ -39,18 +40,29 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="MaestroException"/> class.
         /// </summary>
-        public MaestroException() { }
+        public MaestroException()
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="MaestroException"/> class.
         /// </summary>
         /// <param name="message">The message.</param>
-        public MaestroException(string message) : base(message) { }
+        public MaestroException(string message)
+            : base(message)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="MaestroException"/> class.
         /// </summary>
         /// <param name="message">The message.</param>
         /// <param name="inner">The inner.</param>
-        public MaestroException(string message, Exception inner) : base(message, inner) { }
+        public MaestroException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="MaestroException"/> class.
         /// </summary>
@@ -67,4 +79,4 @@
           System.Runtime.Serialization.StreamingContext context)
             : base(info, context) { }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/NestedExceptionMessageProcessor.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/NestedExceptionMessageProcessor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/NestedExceptionMessageProcessor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,24 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
 using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.Exceptions
@@ -50,4 +52,4 @@
             return sb.ToString();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace OSGeo.MapGuide.MaestroAPI.Exceptions
@@ -29,7 +29,7 @@
     /// thrown by various parts of the Maestro API
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/NullExtentException.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/NullExtentException.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/NullExtentException.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.Exceptions
 {
@@ -39,21 +40,29 @@
         /// <summary>
         /// Creates a new instance
         /// </summary>
-        public NullExtentException() { }
+        public NullExtentException()
+        {
+        }
 
         /// <summary>
         /// Creates a new instance
         /// </summary>
         /// <param name="message"></param>
-        public NullExtentException(string message) : base(message) { }
+        public NullExtentException(string message)
+            : base(message)
+        {
+        }
 
         /// <summary>
         /// Creates a new instance
         /// </summary>
         /// <param name="message"></param>
         /// <param name="inner"></param>
-        public NullExtentException(string message, Exception inner) : base(message, inner) { }
-        
+        public NullExtentException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+
         /// <summary>
         /// Creates a new instance
         /// </summary>
@@ -64,4 +73,4 @@
           System.Runtime.Serialization.StreamingContext context)
             : base(info, context) { }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/ResourceConversionException.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/ResourceConversionException.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/ResourceConversionException.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.Exceptions
 {
@@ -39,18 +40,29 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="ResourceConversionException"/> class.
         /// </summary>
-        public ResourceConversionException() { }
+        public ResourceConversionException()
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ResourceConversionException"/> class.
         /// </summary>
         /// <param name="message">The message.</param>
-        public ResourceConversionException(string message) : base(message) { }
+        public ResourceConversionException(string message)
+            : base(message)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ResourceConversionException"/> class.
         /// </summary>
         /// <param name="message">The message.</param>
         /// <param name="inner">The inner.</param>
-        public ResourceConversionException(string message, Exception inner) : base(message, inner) { }
+        public ResourceConversionException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ResourceConversionException"/> class.
         /// </summary>
@@ -67,4 +79,4 @@
           System.Runtime.Serialization.StreamingContext context)
             : base(info, context) { }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/SerializationException.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/SerializationException.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/SerializationException.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.Exceptions
 {
@@ -39,18 +40,29 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="SerializationException"/> class.
         /// </summary>
-        public SerializationException() { }
+        public SerializationException()
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SerializationException"/> class.
         /// </summary>
         /// <param name="message">The message.</param>
-        public SerializationException(string message) : base(message) { }
+        public SerializationException(string message)
+            : base(message)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SerializationException"/> class.
         /// </summary>
         /// <param name="message">The message.</param>
         /// <param name="inner">The inner.</param>
-        public SerializationException(string message, Exception inner) : base(message, inner) { }
+        public SerializationException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SerializationException"/> class.
         /// </summary>
@@ -67,4 +79,4 @@
           System.Runtime.Serialization.StreamingContext context)
             : base(info, context) { }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/UnsupportedResourceTypeException.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/UnsupportedResourceTypeException.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/UnsupportedResourceTypeException.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.Exceptions
 {
@@ -40,20 +41,34 @@
         /// Initializes a new instance of the <see cref="UnsupportedResourceTypeException"/> class.
         /// </summary>
         /// <param name="rt">The resource type.</param>
-        public UnsupportedResourceTypeException(string rt) { this.ResourceType = rt; }
+        public UnsupportedResourceTypeException(string rt)
+        {
+            this.ResourceType = rt;
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="UnsupportedResourceTypeException"/> class.
         /// </summary>
         /// <param name="rt">The resource type.</param>
         /// <param name="message">The message.</param>
-        public UnsupportedResourceTypeException(string rt, string message) : base(message) { this.ResourceType = rt; }
+        public UnsupportedResourceTypeException(string rt, string message)
+            : base(message)
+        {
+            this.ResourceType = rt;
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="UnsupportedResourceTypeException"/> class.
         /// </summary>
         /// <param name="rt">The resource type.</param>
         /// <param name="message">The message.</param>
         /// <param name="inner">The inner.</param>
-        public UnsupportedResourceTypeException(string rt, string message, Exception inner) : base(message, inner) { this.ResourceType = rt; }
+        public UnsupportedResourceTypeException(string rt, string message, Exception inner)
+            : base(message, inner)
+        {
+            this.ResourceType = rt;
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="UnsupportedResourceTypeException"/> class.
         /// </summary>
@@ -76,4 +91,4 @@
         /// <value>The type of the resource.</value>
         public string ResourceType { get; private set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/UnsupportedServiceTypeException.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/UnsupportedServiceTypeException.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Exceptions/UnsupportedServiceTypeException.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Services;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Services;
 
 namespace OSGeo.MapGuide.MaestroAPI.Exceptions
 {
@@ -42,20 +43,34 @@
         /// Initializes a new instance of the <see cref="UnsupportedServiceTypeException"/> class.
         /// </summary>
         /// <param name="st">The st.</param>
-        public UnsupportedServiceTypeException(ServiceType st) { this.ServiceType = st; }
+        public UnsupportedServiceTypeException(ServiceType st)
+        {
+            this.ServiceType = st;
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="UnsupportedServiceTypeException"/> class.
         /// </summary>
         /// <param name="st">The st.</param>
         /// <param name="message">The message.</param>
-        public UnsupportedServiceTypeException(ServiceType st, string message) : base(message) { this.ServiceType = st; }
+        public UnsupportedServiceTypeException(ServiceType st, string message)
+            : base(message)
+        {
+            this.ServiceType = st;
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="UnsupportedServiceTypeException"/> class.
         /// </summary>
         /// <param name="st">The st.</param>
         /// <param name="message">The message.</param>
         /// <param name="inner">The inner.</param>
-        public UnsupportedServiceTypeException(ServiceType st, string message, Exception inner) : base(message, inner) { this.ServiceType = st; }
+        public UnsupportedServiceTypeException(ServiceType st, string message, Exception inner)
+            : base(message, inner)
+        {
+            this.ServiceType = st;
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="UnsupportedServiceTypeException"/> class.
         /// </summary>
@@ -78,4 +93,4 @@
         /// <value>The type of the service.</value>
         public ServiceType ServiceType { get; private set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/ExpressionEngine.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/ExpressionEngine.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/ExpressionEngine.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using Ciloci.Flee;
+using OSGeo.MapGuide.MaestroAPI.Feature;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using Ciloci.Flee;
+using System.Globalization;
 using System.Reflection;
-using System.Globalization;
-using OSGeo.MapGuide.MaestroAPI.Feature;
 
 namespace OSGeo.MapGuide.MaestroAPI.Expression
 {
@@ -61,7 +62,6 @@
         public ExpressionEngine(FeatureSetReader reader, object customFunctions)
             : this(reader)
         {
-            
         }*/
 
         /// <summary>
@@ -123,7 +123,7 @@
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="expression"></param>
@@ -149,4 +149,4 @@
             return expr.Evaluate();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/ExpressionFeatureReader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/ExpressionFeatureReader.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/ExpressionFeatureReader.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
+using OSGeo.MapGuide.MaestroAPI.Feature;
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Globalization;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using OSGeo.MapGuide.MaestroAPI.Feature;
 
 namespace OSGeo.MapGuide.MaestroAPI.Expression
 {
@@ -42,7 +43,6 @@
         public ExpressionFeatureReader(ReaderBase reader)
             : this(reader, System.Threading.Thread.CurrentThread.CurrentCulture)
         {
-
         }
 
         /// <summary>
@@ -120,7 +120,7 @@
                 _exprEngine.UpdateVariables();
                 return _reader.Current;
             }
-            return null; 
+            return null;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/FdoFunctionNamespace.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/FdoFunctionNamespace.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/FdoFunctionNamespace.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using GeoAPI.Geometries;
 using System;
-using System.Collections.Generic;
 using System.Text;
-using GeoAPI.Geometries;
 
 #pragma warning disable 1591, 0114, 0108
 
@@ -28,7 +30,7 @@
 {
     /// <summary>
     /// Expression class that implements the standard FDO expression functions.
-    /// 
+    ///
     /// Despite the modifier. This class is for Expression Engine use only.
     /// </summary>
     public static class FdoFunctionNamespace
@@ -40,10 +42,8 @@
         // testing for nulls, test for DBNull.Value
         //
 
-        #region Aggregate
-        #endregion
+        #region Conversion
 
-        #region Conversion
         public static object NullValue(object first, object second)
         {
             return first == DBNull.Value ? second : first;
@@ -78,9 +78,11 @@
         {
             return Coalesce(value);
         }
-        #endregion
 
+        #endregion Conversion
+
         #region Date
+
         public static DateTime AddMonths(object value, object months)
         {
             return Convert.ToDateTime(value).AddMonths(Convert.ToInt32(months));
@@ -105,8 +107,9 @@
         {
             throw new NotImplementedException();
         }
-        #endregion
 
+        #endregion Date
+
         #region Geometry
 
         public static double Area2D(IGeometry geom)
@@ -151,9 +154,10 @@
             return double.NaN;
         }
 
-        #endregion
+        #endregion Geometry
 
         #region Math
+
         public static double Abs(object value)
         {
             return Math.Abs(Convert.ToDouble(value));
@@ -233,10 +237,11 @@
         {
             return Math.Tan(Convert.ToDouble(value));
         }
-        #endregion
 
+        #endregion Math
+
         #region Numeric
-        
+
         public static double Ceil(double value)
         {
             return Math.Ceiling(value);
@@ -261,9 +266,11 @@
         {
             return Math.Truncate(value);
         }
-        #endregion
 
+        #endregion Numeric
+
         #region String
+
         /// <summary>
         /// Returns a concatenated result of 2 string expressions
         /// </summary>
@@ -395,7 +402,7 @@
             // |           the that resulted from step 4.
             // |   Step 6: Remove all the zeros from the string that resulted from step 5.
             // |   Step 7: Pad the string resulting from step 6 with trailing zeros and
-            // |           return the first 4 positions (resulting in a string of the 
+            // |           return the first 4 positions (resulting in a string of the
             // |           structure <letter><number><number><number>).
             // +---------------------------------------------------------------------------
             throw new NotImplementedException();
@@ -440,6 +447,7 @@
         {
             return Coalesce(str).ToUpper();
         }
-        #endregion
+
+        #endregion String
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/MgFunctionNamespace.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/MgFunctionNamespace.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/MgFunctionNamespace.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 #pragma warning disable 1591, 0114, 0108
 
 namespace OSGeo.MapGuide.MaestroAPI.Expression
 {
     /// <summary>
     /// Expression class that implements the standard MapGuide FDO expression functions
-    /// 
+    ///
     /// Despite the modifier. This class is for Expression Engine use only.
     /// </summary>
     public static class MgFunctionNamespace
@@ -40,4 +39,4 @@
         // Lookup()
         // Range()
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Expression/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace OSGeo.MapGuide.MaestroAPI.Expression
@@ -29,7 +29,7 @@
     /// FDO expressions
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/ClrFdoTypeMap.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/ClrFdoTypeMap.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/ClrFdoTypeMap.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using GeoAPI.Geometries;
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using GeoAPI.Geometries;
 
 namespace OSGeo.MapGuide.MaestroAPI.Feature
 {
@@ -41,24 +42,34 @@
             {
                 case DataPropertyType.Blob:
                     return typeof(byte[]);
+
                 case DataPropertyType.Boolean:
                     return typeof(bool);
+
                 case DataPropertyType.Byte:
                     return typeof(byte);
+
                 case DataPropertyType.Clob:
                     return typeof(char[]);
+
                 case DataPropertyType.DateTime:
                     return typeof(DateTime);
+
                 case DataPropertyType.Double:
                     return typeof(double);
+
                 case DataPropertyType.Int16:
                     return typeof(short);
+
                 case DataPropertyType.Int32:
                     return typeof(int);
+
                 case DataPropertyType.Int64:
                     return typeof(long);
+
                 case DataPropertyType.Single:
                     return typeof(float);
+
                 case DataPropertyType.String:
                     return typeof(string);
             }
@@ -76,29 +87,40 @@
             {
                 case PropertyValueType.Blob:
                     return typeof(byte[]);
+
                 case PropertyValueType.Boolean:
                     return typeof(bool);
+
                 case PropertyValueType.Byte:
                     return typeof(byte);
+
                 case PropertyValueType.Clob:
                     return typeof(char[]);
+
                 case PropertyValueType.DateTime:
                     return typeof(DateTime);
+
                 case PropertyValueType.Double:
                     return typeof(double);
+
                 case PropertyValueType.Feature:
                     return typeof(IFeature[]);
+
                 case PropertyValueType.Geometry:
                     return typeof(IGeometry);
+
                 case PropertyValueType.Int16:
                     return typeof(short);
+
                 case PropertyValueType.Int32:
                     return typeof(int);
+
                 case PropertyValueType.Int64:
                     return typeof(long);
                 //case PropertyValueType.Raster:
                 case PropertyValueType.Single:
                     return typeof(float);
+
                 case PropertyValueType.String:
                     return typeof(string);
             }
@@ -121,6 +143,7 @@
                     };
                 case PropertyDefinitionType.Geometry:
                     return typeof(IGeometry);
+
                 case PropertyDefinitionType.Object:
                     return typeof(IFeature[]);
                 //case PropertyDefinitionType.Raster:
@@ -128,4 +151,4 @@
             throw new ArgumentException();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/FeatureBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/FeatureBase.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/FeatureBase.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 
 namespace OSGeo.MapGuide.MaestroAPI.Feature
 {
@@ -36,10 +37,11 @@
         /// Initializes a new instance of the <see cref="FeatureBase"/> class.
         /// </summary>
         /// <param name="clsDef">The class definition.</param>
-        public FeatureBase(ClassDefinition clsDef) : base()
+        public FeatureBase(ClassDefinition clsDef)
+            : base()
         {
             _clsDef = clsDef;
-            
+
             for (int i = 0; i < clsDef.Properties.Count; i++)
             {
                 var prop = clsDef[i];
@@ -54,45 +56,58 @@
                                 case DataPropertyType.Blob:
                                     _values[prop.Name] = new BlobValue();
                                     break;
+
                                 case DataPropertyType.Boolean:
                                     _values[prop.Name] = new BooleanValue();
                                     break;
+
                                 case DataPropertyType.Byte:
                                     _values[prop.Name] = new ByteValue();
                                     break;
+
                                 case DataPropertyType.Clob:
                                     _values[prop.Name] = new ClobValue();
                                     break;
+
                                 case DataPropertyType.DateTime:
                                     _values[prop.Name] = new DateTimeValue();
                                     break;
+
                                 case DataPropertyType.Double:
                                     _values[prop.Name] = new DoubleValue();
                                     break;
+
                                 case DataPropertyType.Int16:
                                     _values[prop.Name] = new Int16Value();
                                     break;
+
                                 case DataPropertyType.Int32:
                                     _values[prop.Name] = new Int32Value();
                                     break;
+
                                 case DataPropertyType.Int64:
                                     _values[prop.Name] = new Int64Value();
                                     break;
+
                                 case DataPropertyType.Single:
                                     _values[prop.Name] = new SingleValue();
                                     break;
+
                                 case DataPropertyType.String:
                                     _values[prop.Name] = new StringValue();
                                     break;
                             }
                         }
                         break;
+
                     case PropertyDefinitionType.Geometry:
                         _values[prop.Name] = new GeometryValue();
                         break;
+
                     case PropertyDefinitionType.Object:
                         _values[prop.Name] = new FeatureValue();
                         break;
+
                     case PropertyDefinitionType.Raster:
                         _values[prop.Name] = new RasterValue();
                         break;
@@ -192,7 +207,6 @@
         /// </summary>
         public override void Close()
         {
-            
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/FeatureReaderBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/FeatureReaderBase.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/FeatureReaderBase.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Text;
-using System.Collections;
-using System.Data;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 
 namespace OSGeo.MapGuide.MaestroAPI.Feature
 {
@@ -117,7 +118,7 @@
             return ReadNextFeature();
         }
 
-        class Enumerator : IEnumerator<IFeature>
+        private class Enumerator : IEnumerator<IFeature>
         {
             private FeatureReaderBase _reader;
 
@@ -133,7 +134,6 @@
 
             public void Dispose()
             {
-                
             }
 
             object IEnumerator.Current
@@ -174,4 +174,4 @@
             return new Enumerator(this);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IFeatureReader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IFeatureReader.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IFeatureReader.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 
 namespace OSGeo.MapGuide.MaestroAPI.Feature
 {
     /// <summary>
-    /// Provides a forward-only, read-only iterator 
+    /// Provides a forward-only, read-only iterator
     /// for reading features selected from a feature source
     /// </summary>
     /// <remarks>
@@ -37,7 +38,6 @@
     /// </remarks>
     public interface IFeatureReader : IReader, IFeature, IEnumerable<IFeature>
     {
-        
     }
 
     /// <summary>
@@ -52,9 +52,9 @@
     public interface IFeature : IRecord
     {
         /// <summary>
-        /// Gets the class definition of the object currently being read. If the user has requested 
-        /// only a subset of the class properties (as specified in the filter text), the class 
-        /// definition reflects what the user has requested, rather than the full class definition. 
+        /// Gets the class definition of the object currently being read. If the user has requested
+        /// only a subset of the class properties (as specified in the filter text), the class
+        /// definition reflects what the user has requested, rather than the full class definition.
         /// </summary>
         ClassDefinition ClassDefinition { get; }
 
@@ -81,9 +81,9 @@
     public interface IMutableFeature : IMutableRecord
     {
         /// <summary>
-        /// Gets the class definition of the object currently being read. If the user has requested 
-        /// only a subset of the class properties (as specified in the filter text), the class 
-        /// definition reflects what the user has requested, rather than the full class definition. 
+        /// Gets the class definition of the object currently being read. If the user has requested
+        /// only a subset of the class properties (as specified in the filter text), the class
+        /// definition reflects what the user has requested, rather than the full class definition.
         /// </summary>
         ClassDefinition ClassDefinition { get; }
 
@@ -103,4 +103,4 @@
         /// <returns></returns>
         IFeatureReader GetFeatureObject(int index);
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IReader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IReader.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/IReader.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using GeoAPI.Geometries;
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using GeoAPI.Geometries;
 
 namespace OSGeo.MapGuide.MaestroAPI.Feature
 {
     /// <summary>
-    /// Provides a forward-only, read-only iterator for reading data. You must call <see cref="ReadNext"/> 
+    /// Provides a forward-only, read-only iterator for reading data. You must call <see cref="ReadNext"/>
     /// before you can access any data
     /// </summary>
     /// <remarks>
@@ -39,13 +41,13 @@
     public interface IReader : IDisposable, IRecord
     {
         /// <summary>
-        /// Advances the reader to the next item and determines whether there is another object to read. 
+        /// Advances the reader to the next item and determines whether there is another object to read.
         /// </summary>
         /// <returns></returns>
         bool ReadNext();
 
         /// <summary>
-        /// Closes the object, freeing any resources it may be holding. 
+        /// Closes the object, freeing any resources it may be holding.
         /// </summary>
         void Close();
     }
@@ -59,10 +61,12 @@
         /// The reader is a Data Reader
         /// </summary>
         Data = 1,
+
         /// <summary>
         /// The reader is a SQL Reader
         /// </summary>
         Sql = 2,
+
         /// <summary>
         /// The reader is a Feature Reader
         /// </summary>
@@ -201,7 +205,7 @@
         /// <param name="name"></param>
         /// <returns></returns>
         short GetInt16(string name);
-        
+
         /// <summary>
         /// Gets the int32 value of the specified property
         /// </summary>
@@ -278,7 +282,7 @@
         /// <param name="index"></param>
         /// <returns></returns>
         DateTime GetDateTime(int index);
-        
+
         /// <summary>
         /// Gets the int16 value at the specified index
         /// </summary>
@@ -292,7 +296,7 @@
         /// <param name="index"></param>
         /// <returns></returns>
         int GetInt32(int index);
-        
+
         /// <summary>
         /// Gets the int64 value at the specified index
         /// </summary>
@@ -313,7 +317,7 @@
         /// <param name="index"></param>
         /// <returns></returns>
         string GetString(int index);
-        
+
         /// <summary>
         /// Gets the geometry value at the specified index
         /// </summary>
@@ -344,6 +348,7 @@
         /// <param name="name">The name.</param>
         /// <returns></returns>
         PropertyValueType GetPropertyType(string name);
+
         /// <summary>
         /// Gets the type of the property at the specified index.
         /// </summary>
@@ -580,4 +585,4 @@
         /// <returns></returns>
         void SetGeometry(int index, IGeometry value);
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/LimitingFeatureReader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/LimitingFeatureReader.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/LimitingFeatureReader.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,27 @@
 #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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.Feature
 {
@@ -254,4 +255,4 @@
             return _reader.GetEnumerator();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/MutableFeatureBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/MutableFeatureBase.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/MutableFeatureBase.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Schema;
 
 namespace OSGeo.MapGuide.MaestroAPI.Feature
@@ -52,7 +52,6 @@
         protected MutableFeatureBase(MutableFeatureBase feat)
             : this(feat, feat.ClassDefinition)
         {
-
         }
 
         /// <summary>
@@ -63,4 +62,4 @@
             get { return _clsDef; }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/MutableRecordBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/MutableRecordBase.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/MutableRecordBase.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
+using GeoAPI.Geometries;
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using GeoAPI.Geometries;
 
 namespace OSGeo.MapGuide.MaestroAPI.Feature
 {
@@ -60,30 +61,43 @@
                 {
                     case PropertyValueType.Blob:
                         return new BlobValue();
+
                     case PropertyValueType.Boolean:
                         return new BooleanValue();
+
                     case PropertyValueType.Byte:
                         return new ByteValue();
+
                     case PropertyValueType.Clob:
                         return new ClobValue();
+
                     case PropertyValueType.DateTime:
                         return new DateTimeValue();
+
                     case PropertyValueType.Double:
                         return new DoubleValue();
+
                     case PropertyValueType.Feature:
                         return new FeatureValue();
+
                     case PropertyValueType.Geometry:
                         return new GeometryValue();
+
                     case PropertyValueType.Int16:
                         return new Int16Value();
+
                     case PropertyValueType.Int32:
                         return new Int32Value();
+
                     case PropertyValueType.Int64:
                         return new Int64Value();
+
                     case PropertyValueType.Raster:
                         return new RasterValue();
+
                     case PropertyValueType.Single:
                         return new SingleValue();
+
                     case PropertyValueType.String:
                         return new StringValue();
                 }
@@ -94,30 +108,43 @@
                 {
                     case PropertyValueType.Blob:
                         return new BlobValue(((BlobValue)propertyValue).Value);
+
                     case PropertyValueType.Boolean:
                         return new BooleanValue(((BooleanValue)propertyValue).Value);
+
                     case PropertyValueType.Byte:
                         return new ByteValue(((ByteValue)propertyValue).Value);
+
                     case PropertyValueType.Clob:
                         return new ClobValue(((ClobValue)propertyValue).Value);
+
                     case PropertyValueType.DateTime:
                         return new DateTimeValue(((DateTimeValue)propertyValue).Value);
+
                     case PropertyValueType.Double:
                         return new DoubleValue(((DoubleValue)propertyValue).Value);
+
                     case PropertyValueType.Feature:
                         return new FeatureValue(((FeatureValue)propertyValue).Value);
+
                     case PropertyValueType.Geometry:
                         return new GeometryValue(((GeometryValue)propertyValue).Value);
+
                     case PropertyValueType.Int16:
                         return new Int16Value(((Int16Value)propertyValue).Value);
+
                     case PropertyValueType.Int32:
                         return new Int32Value(((Int32Value)propertyValue).Value);
+
                     case PropertyValueType.Int64:
                         return new Int64Value(((Int64Value)propertyValue).Value);
+
                     case PropertyValueType.Raster:
                         return new RasterValue(((RasterValue)propertyValue).Value);
+
                     case PropertyValueType.Single:
                         return new SingleValue(((SingleValue)propertyValue).Value);
+
                     case PropertyValueType.String:
                         return new StringValue(((StringValue)propertyValue).Value);
                 }
@@ -159,36 +186,47 @@
                     case PropertyValueType.Blob:
                         SetBlob(name, (byte[])value);
                         break;
+
                     case PropertyValueType.Boolean:
                         SetBoolean(name, (bool)value);
                         break;
+
                     case PropertyValueType.Byte:
                         SetByte(name, (byte)value);
                         break;
+
                     case PropertyValueType.Clob:
                         SetClob(name, (char[])value);
                         break;
+
                     case PropertyValueType.DateTime:
                         SetDateTime(name, (DateTime)value);
                         break;
+
                     case PropertyValueType.Double:
                         SetDouble(name, (double)value);
                         break;
+
                     case PropertyValueType.Geometry:
                         SetGeometry(name, (IGeometry)value);
                         break;
+
                     case PropertyValueType.Int16:
                         SetInt16(name, (short)value);
                         break;
+
                     case PropertyValueType.Int32:
                         SetInt32(name, (int)value);
                         break;
+
                     case PropertyValueType.Int64:
                         SetInt64(name, (long)value);
                         break;
+
                     case PropertyValueType.Single:
                         SetSingle(name, (float)value);
                         break;
+
                     case PropertyValueType.String:
                         SetString(name, (string)value);
                         break;
@@ -505,7 +543,7 @@
     }
 
     /// <summary>
-    /// A record whose properties can be modified and allows for adding of new 
+    /// A record whose properties can be modified and allows for adding of new
     /// <see cref="T:OSGeo.MapGuide.MaestroAPI.Feature.PropertyValue"/> instances
     /// </summary>
     public class MutableRecord : MutableRecordBase
@@ -513,6 +551,9 @@
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public MutableRecord() : base(null) { }
+        public MutableRecord()
+            : base(null)
+        {
+        }
     }
 }
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace OSGeo.MapGuide.MaestroAPI.Feature
@@ -29,7 +29,7 @@
     /// results.
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/PropertyValue.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/PropertyValue.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/PropertyValue.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using GeoAPI.Geometries;
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 using System.Globalization;
-using GeoAPI.Geometries;
 
 namespace OSGeo.MapGuide.MaestroAPI.Feature
 {
@@ -35,7 +36,10 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="PropertyValue"/> class.
         /// </summary>
-        protected PropertyValue() { this.IsNull = true; }
+        protected PropertyValue()
+        {
+            this.IsNull = true;
+        }
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance is null.
@@ -48,7 +52,10 @@
         /// <summary>
         /// Sets the value to null.
         /// </summary>
-        public virtual void SetNull() { this.IsNull = true; }
+        public virtual void SetNull()
+        {
+            this.IsNull = true;
+        }
 
         /// <summary>
         /// Gets the type.
@@ -79,7 +86,10 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="ValueTypePropertyValue<T>"/> class.
         /// </summary>
-        protected ValueTypePropertyValue() : base() { }
+        protected ValueTypePropertyValue()
+            : base()
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ValueTypePropertyValue<T>"/> class.
@@ -157,7 +167,10 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="ReferenceTypePropertyValue<T>"/> class.
         /// </summary>
-        protected ReferenceTypePropertyValue() : base() { }
+        protected ReferenceTypePropertyValue()
+            : base()
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ReferenceTypePropertyValue<T>"/> class.
@@ -202,12 +215,18 @@
         /// <summary>
         /// Initializes this instance
         /// </summary>
-        public ByteValue() : base() { }
+        public ByteValue()
+            : base()
+        {
+        }
 
         /// <summary>
         /// Initializes this instance
         /// </summary>
-        public ByteValue(byte value) : base() { }
+        public ByteValue(byte value)
+            : base()
+        {
+        }
 
         /// <summary>
         /// Gets the type.
@@ -238,12 +257,18 @@
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public BooleanValue() : base() { }
+        public BooleanValue()
+            : base()
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public BooleanValue(bool value) : base(value) { }
+        public BooleanValue(bool value)
+            : base(value)
+        {
+        }
 
         /// <summary>
         /// Gets the type.
@@ -274,12 +299,18 @@
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public BlobValue() : base() { }
+        public BlobValue()
+            : base()
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public BlobValue(byte[] value) : base(value) { } 
+        public BlobValue(byte[] value)
+            : base(value)
+        {
+        }
 
         /// <summary>
         /// Gets the type.
@@ -318,12 +349,18 @@
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public ClobValue() : base() { }
+        public ClobValue()
+            : base()
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public ClobValue(char[] value) : base(value) { }
+        public ClobValue(char[] value)
+            : base(value)
+        {
+        }
 
         /// <summary>
         /// Gets the type.
@@ -362,12 +399,18 @@
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public DateTimeValue() : base() { }
+        public DateTimeValue()
+            : base()
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public DateTimeValue(DateTime value) : base(value) { }
+        public DateTimeValue(DateTime value)
+            : base(value)
+        {
+        }
 
         /// <summary>
         /// Gets the type.
@@ -377,7 +420,7 @@
             get { return PropertyValueType.DateTime; }
         }
 
-        static string PadLeft(string str, char ch, int totalChars)
+        private static string PadLeft(string str, char ch, int totalChars)
         {
             var value = str;
             while (value.Length < totalChars)
@@ -413,12 +456,18 @@
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public DoubleValue() : base() { }
+        public DoubleValue()
+            : base()
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public DoubleValue(double value) : base(value) { }
+        public DoubleValue(double value)
+            : base(value)
+        {
+        }
 
         /// <summary>
         /// Gets the type.
@@ -449,12 +498,18 @@
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public FeatureValue() : base() { }
+        public FeatureValue()
+            : base()
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public FeatureValue(IFeature[] values) : base(values) { }
+        public FeatureValue(IFeature[] values)
+            : base(values)
+        {
+        }
 
         /// <summary>
         /// Gets the type.
@@ -496,12 +551,18 @@
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public GeometryValue() : base() { }
+        public GeometryValue()
+            : base()
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public GeometryValue(IGeometry value) : base(value) { }
+        public GeometryValue(IGeometry value)
+            : base(value)
+        {
+        }
 
         /// <summary>
         /// Gets the type.
@@ -543,12 +604,18 @@
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public Int16Value() : base() { }
+        public Int16Value()
+            : base()
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public Int16Value(short value) : base(value) { }
+        public Int16Value(short value)
+            : base(value)
+        {
+        }
 
         /// <summary>
         /// Gets the type.
@@ -579,12 +646,18 @@
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public Int32Value() : base() { }
+        public Int32Value()
+            : base()
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public Int32Value(int value) : base(value) { }
+        public Int32Value(int value)
+            : base(value)
+        {
+        }
 
         /// <summary>
         /// Gets the type.
@@ -615,12 +688,18 @@
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public Int64Value() : base() { }
+        public Int64Value()
+            : base()
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public Int64Value(long value) : base(value) { }
+        public Int64Value(long value)
+            : base(value)
+        {
+        }
 
         /// <summary>
         /// Gets the type.
@@ -651,12 +730,18 @@
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public RasterValue() : base() { }
+        public RasterValue()
+            : base()
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public RasterValue(byte[] value) : base(value) { }
+        public RasterValue(byte[] value)
+            : base(value)
+        {
+        }
 
         /// <summary>
         /// Gets the type.
@@ -695,12 +780,18 @@
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public SingleValue() : base() { }
+        public SingleValue()
+            : base()
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public SingleValue(float value) : base(value) { }
+        public SingleValue(float value)
+            : base(value)
+        {
+        }
 
         /// <summary>
         /// Gets the type.
@@ -731,12 +822,18 @@
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public StringValue() : base() { }
+        public StringValue()
+            : base()
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance
         /// </summary>
-        public StringValue(string value) : base(value) { }
+        public StringValue(string value)
+            : base(value)
+        {
+        }
 
         /// <summary>
         /// Gets the type.
@@ -769,4 +866,4 @@
             return this.Value;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/ReaderBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/ReaderBase.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/ReaderBase.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using GeoAPI.Geometries;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using GeoAPI.Geometries;
 
 namespace OSGeo.MapGuide.MaestroAPI.Feature
 {
@@ -78,12 +79,16 @@
         /// <summary>
         /// Closes the object, freeing any resources it may be holding.
         /// </summary>
-        public virtual void Close() { }
+        public virtual void Close()
+        {
+        }
 
         /// <summary>
         /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
-        public virtual void Dispose() { }
+        public virtual void Dispose()
+        {
+        }
 
         /// <summary>
         /// Gets the CLR type of the field at the specified index
@@ -383,4 +388,4 @@
         /// <returns></returns>
         public abstract OSGeo.MapGuide.MaestroAPI.Schema.PropertyValueType GetPropertyType(int index);
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/RecordBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/RecordBase.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Feature/RecordBase.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using GeoAPI.Geometries;
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using GeoAPI.Geometries;
 
 namespace OSGeo.MapGuide.MaestroAPI.Feature
 {
@@ -35,6 +37,7 @@
         /// The map of property values
         /// </summary>
         protected Dictionary<string, PropertyValue> _values;
+
         /// <summary>
         /// A dictionary to map indexes to property names
         /// </summary>
@@ -383,30 +386,41 @@
                 {
                     case PropertyValueType.Blob:
                         return GetBlob(name);
+
                     case PropertyValueType.Boolean:
                         return GetBoolean(name);
+
                     case PropertyValueType.Byte:
                         return GetByte(name);
+
                     case PropertyValueType.Clob:
                         return GetClob(name);
+
                     case PropertyValueType.DateTime:
                         return GetDateTime(name);
+
                     case PropertyValueType.Double:
                         return GetDouble(name);
+
                     case PropertyValueType.Feature:
                         return GetFeatureObject(name);
+
                     case PropertyValueType.Geometry:
                         return GetGeometry(name);
+
                     case PropertyValueType.Int16:
                         return GetInt16(name);
+
                     case PropertyValueType.Int32:
                         return GetInt32(name);
+
                     case PropertyValueType.Int64:
                         return GetInt64(name);
                     //case PropertyValueType.Raster:
                     //    return GetRaster(name);
                     case PropertyValueType.Single:
                         return GetSingle(name);
+
                     case PropertyValueType.String:
                         return GetString(name);
                 }
@@ -468,18 +482,23 @@
                     case PropertyValueType.Blob:
                         ((BlobValue)val).Value = record.GetBlob(i);
                         break;
+
                     case PropertyValueType.Boolean:
                         ((BooleanValue)val).Value = record.GetBoolean(i);
                         break;
+
                     case PropertyValueType.Byte:
                         ((ByteValue)val).Value = record.GetByte(i);
                         break;
+
                     case PropertyValueType.Clob:
                         ((ClobValue)val).Value = record.GetClob(i);
                         break;
+
                     case PropertyValueType.DateTime:
                         ((DateTimeValue)val).Value = record.GetDateTime(i);
                         break;
+
                     case PropertyValueType.Double:
                         ((DoubleValue)val).Value = record.GetDouble(i);
                         break;
@@ -496,12 +515,15 @@
                     case PropertyValueType.Geometry:
                         ((GeometryValue)val).Value = record.GetGeometry(i);
                         break;
+
                     case PropertyValueType.Int16:
                         ((Int16Value)val).Value = record.GetInt16(i);
                         break;
+
                     case PropertyValueType.Int32:
                         ((Int32Value)val).Value = record.GetInt32(i);
                         break;
+
                     case PropertyValueType.Int64:
                         ((Int64Value)val).Value = record.GetInt64(i);
                         break;
@@ -511,6 +533,7 @@
                     case PropertyValueType.Single:
                         ((SingleValue)val).Value = record.GetSingle(i);
                         break;
+
                     case PropertyValueType.String:
                         ((StringValue)val).Value = record.GetString(i);
                         break;
@@ -546,4 +569,4 @@
             return GetPropertyType(_ordinalMap[index]);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/IConnectionCapabilities.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/IConnectionCapabilities.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/IConnectionCapabilities.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI
 {
@@ -93,4 +94,4 @@
         /// </summary>
         string[] SupportedResourceTypes { get; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/IO/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/IO/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/IO/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace OSGeo.MapGuide.MaestroAPI.IO
@@ -28,7 +28,7 @@
     /// The <c>OSGeo.MapGuide.MaestroAPI.IO</c> namespace provides I/O services
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/IO/ReadOnlyRewindableStream.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/IO/ReadOnlyRewindableStream.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/IO/ReadOnlyRewindableStream.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.IO;
 
 namespace OSGeo.MapGuide.MaestroAPI.IO
@@ -59,7 +60,7 @@
         }
 
         /// <summary>
-        /// Gets whether this stream is rewindable. If not, calls to <see cref="Rewind"/> throw a 
+        /// Gets whether this stream is rewindable. If not, calls to <see cref="Rewind"/> throw a
         /// <see cref="T:System.InvalidOperationException"/>
         /// </summary>
         public abstract bool CanRewind { get; }
@@ -110,4 +111,4 @@
             throw new NotImplementedException();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/IServerConnection.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/IServerConnection.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/IServerConnection.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,37 +1,38 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Services;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Commands;
 using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
+using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels.LoadProcedure;
+using System;
 using System.Collections.Specialized;
 
 namespace OSGeo.MapGuide.MaestroAPI
 {
     /// <summary>
     /// <para>
-    /// MapGuide Platform connection interface. This is the root object of the Maestro API which typically 
-    /// represents a session with a MapGuide Server. Connections are created through the 
+    /// MapGuide Platform connection interface. This is the root object of the Maestro API which typically
+    /// represents a session with a MapGuide Server. Connections are created through the
     /// <see cref="T:OSGeo.MapGuide.MaestroAPI.ConnectionProviderRegistry"/> class.
     /// </para>
     /// <para>
@@ -45,12 +46,12 @@
     ///         <description>Feature Service (<see cref="T:OSGeo.MapGuide.MaestroAPI.Services.IFeatureService"/>) an abstraction layer for querying feature data in technology-independent manner.</description>
     ///     </item>
     ///     <item>
-    ///         <description>Coordinate System Catalog (<see cref="T:OSGeo.MapGuide.MaestroAPI.CoordinateSystem.ICoordinateSystemCatalog"/> for querying coordinate systems and for translating WKT, cs code and EPSG codes to other forms</description>    
-    ///     </item> 
+    ///         <description>Coordinate System Catalog (<see cref="T:OSGeo.MapGuide.MaestroAPI.CoordinateSystem.ICoordinateSystemCatalog"/> for querying coordinate systems and for translating WKT, cs code and EPSG codes to other forms</description>
+    ///     </item>
     /// </list>
     /// <para>
-    /// Additional services are supported at various levels depending on the implementation. 
-    /// The <see cref="P:OSGeo.MapGuide.MaestroAPI.IServerConnection.Capabilities"/> property provides information about 
+    /// Additional services are supported at various levels depending on the implementation.
+    /// The <see cref="P:OSGeo.MapGuide.MaestroAPI.IServerConnection.Capabilities"/> property provides information about
     /// what features, services and resource types are not supported.
     /// </para>
     /// </summary>
@@ -90,7 +91,7 @@
         /// <param name="ignoreUnsupportedFeatures"></param>
         /// <returns></returns>
         string[] ExecuteLoadProcedure(ILoadProcedure loadProc, OSGeo.MapGuide.MaestroAPI.LengthyOperationProgressCallBack callback, bool ignoreUnsupportedFeatures);
-        
+
         /// <summary>
         /// Executes the load procedure indicated by the specified resource id
         /// </summary>
@@ -170,7 +171,7 @@
         /// Gets the coordinate system catalog
         /// </summary>
         ICoordinateSystemCatalog CoordinateSystemCatalog { get; }
-        
+
         /// <summary>
         /// Gets a string that can be used to identify the server by a user
         /// </summary>
@@ -228,7 +229,7 @@
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     public delegate void RequestEventHandler(object sender, RequestEventArgs e);
 
@@ -282,4 +283,4 @@
             return "Session:" + conn.SessionID + "//" + name + "." + resType; //NOXLATE
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Internal/FixedWKTReader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Internal/FixedWKTReader.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Internal/FixedWKTReader.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,49 +1,55 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
+using GeoAPI.Geometries;
+using GisSharpBlog.NetTopologySuite.Geometries;
+using GisSharpBlog.NetTopologySuite.IO;
+using GisSharpBlog.NetTopologySuite.Utilities;
+using RTools_NTS.Util;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
-using GeoAPI.Geometries;
-using GisSharpBlog.NetTopologySuite.Geometries;
-using RTools_NTS.Util;
-using GisSharpBlog.NetTopologySuite.IO;
-using GisSharpBlog.NetTopologySuite.Utilities;
 
 namespace OSGeo.MapGuide.MaestroAPI.Internal
 {
-    /// <summary>  
+    /// <summary>
     /// A fixed version of WKTReader that can parse 3D geometry WKT
     /// </summary>
     public class FixedWKTReader
     {
         private IGeometryFactory geometryFactory;
         private IPrecisionModel precisionModel;
-        int index;
+        private int index;
 
-        /// <summary> 
+        /// <summary>
         /// Creates a <c>WKTReader</c> that creates objects using a basic GeometryFactory.
         /// </summary>
-        public FixedWKTReader() : this(GeometryFactory.Default) { }
+        public FixedWKTReader()
+            : this(GeometryFactory.Default)
+        {
+        }
 
-        /// <summary>  
+        /// <summary>
         /// Creates a <c>WKTReader</c> that creates objects using the given
         /// <c>GeometryFactory</c>.
         /// </summary>
@@ -72,10 +78,10 @@
             }
         }
 
-        /// <summary>  
+        /// <summary>
         /// Converts a Well-known Text representation to a <c>Geometry</c>.
         /// </summary>
-        /// <param name="reader"> 
+        /// <param name="reader">
         /// A Reader which will return a "Geometry Tagged Text"
         /// string (see the OpenGIS Simple Features Specification).
         /// </param>
@@ -131,7 +137,7 @@
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="tokens"></param>
         /// <param name="skipExtraParenthesis"></param>
@@ -173,7 +179,7 @@
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="tokens"></param>
         /// <returns></returns>
@@ -440,7 +446,7 @@
             return geometryFactory.CreateMultiPoint(ToPoints(GetCoordinates(tokens, true)));
         }
 
-        /// <summary> 
+        /// <summary>
         /// Creates an array of <c>Point</c>s having the given <c>Coordinate</c>s.
         /// </summary>
         /// <param name="coordinates">
@@ -458,7 +464,7 @@
             return points.ToArray();
         }
 
-        /// <summary>  
+        /// <summary>
         /// Creates a <c>Polygon</c> using the next token in the stream.
         /// </summary>
         /// <param name="tokens">
@@ -467,7 +473,7 @@
         /// </param>
         /// <returns>
         /// A <c>Polygon</c> specified by the next token
-        /// in the stream.        
+        /// in the stream.
         /// </returns>
         private IPolygon ReadPolygonText(IList tokens)
         {
@@ -517,7 +523,7 @@
             return geometryFactory.CreateMultiLineString(lineStrings.ToArray());
         }
 
-        /// <summary>  
+        /// <summary>
         /// Creates a <c>MultiPolygon</c> using the next token in the stream.
         /// </summary>
         /// <param name="tokens">Tokenizer over a stream of text in Well-known Text

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/LengthyOperationCallbackArgs.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/LengthyOperationCallbackArgs.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/LengthyOperationCallbackArgs.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,24 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
-using System;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI
 {
     /// <summary>
@@ -26,152 +27,151 @@
     /// </summary>
     /// <param name="sender"></param>
     /// <param name="items"></param>
-	public delegate void LengthyOperationCallBack(object sender, LengthyOperationCallbackArgs items);
+    public delegate void LengthyOperationCallBack(object sender, LengthyOperationCallbackArgs items);
 
     /// <summary>
     /// A delegate used to represent relay progress for lengthy operations
     /// </summary>
     /// <param name="sender"></param>
     /// <param name="e"></param>
-	public delegate void LengthyOperationProgressCallBack(object sender, LengthyOperationProgressArgs e);
+    public delegate void LengthyOperationProgressCallBack(object sender, LengthyOperationProgressArgs e);
 
     /// <summary>
     /// Represents progress of a lengthy operation
     /// </summary>
-	public class LengthyOperationProgressArgs
-	{
+    public class LengthyOperationProgressArgs
+    {
         /// <summary>
         /// The message
         /// </summary>
-		public string StatusMessage;
+        public string StatusMessage;
 
         /// <summary>
         /// The progress percentage
         /// </summary>
-		public int Progress;
+        public int Progress;
 
         /// <summary>
         /// Indicates whether a cancel request has been made
         /// </summary>
-		public bool Cancel;
+        public bool Cancel;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="LengthyOperationProgressArgs"/> class.
         /// </summary>
         /// <param name="message">The message.</param>
         /// <param name="progress">The progress.</param>
-		public LengthyOperationProgressArgs(string message, int progress)
-		{
-			StatusMessage = message;
-			Progress = progress;
-			Cancel = false;
-		}
-	}
+        public LengthyOperationProgressArgs(string message, int progress)
+        {
+            StatusMessage = message;
+            Progress = progress;
+            Cancel = false;
+        }
+    }
 
-
-	/// <summary>
+    /// <summary>
     /// Represents progress of a lengthy operation
-	/// </summary>
-	public class LengthyOperationCallbackArgs
-	{
-		private LengthyOperationItem[] m_items;
-		private int m_index;
-		private bool m_cancel;
+    /// </summary>
+    public class LengthyOperationCallbackArgs
+    {
+        private LengthyOperationItem[] m_items;
+        private int m_index;
+        private bool m_cancel;
 
-
         /// <summary>
         /// Initializes a new instance of the <see cref="LengthyOperationCallbackArgs"/> class.
         /// </summary>
         /// <param name="items">The items.</param>
-		public LengthyOperationCallbackArgs(LengthyOperationItem[] items)
-		{
-			m_items = items;
-			m_index = 0;
-			m_cancel = false;
-		}
+        public LengthyOperationCallbackArgs(LengthyOperationItem[] items)
+        {
+            m_items = items;
+            m_index = 0;
+            m_cancel = false;
+        }
 
         /// <summary>
         /// Gets or sets whether this lengthy operation should be cancelled
         /// </summary>
-		public bool Cancel
-		{
-			get { return m_cancel; }
-			set { m_cancel = value; }
-		}
-        
+        public bool Cancel
+        {
+            get { return m_cancel; }
+            set { m_cancel = value; }
+        }
+
         /// <summary>
         /// Gets or sets the index
         /// </summary>
-		public int Index
-		{
-			get { return m_index; }
-			set { m_index = value; }
-		}
+        public int Index
+        {
+            get { return m_index; }
+            set { m_index = value; }
+        }
 
         /// <summary>
         /// Gets the operation items
         /// </summary>
-		public LengthyOperationItem[] Items
-		{
-			get { return m_items; }
-		}
+        public LengthyOperationItem[] Items
+        {
+            get { return m_items; }
+        }
 
-
         /// <summary>
-        /// 
+        ///
         /// </summary>
-		public class LengthyOperationItem
-		{
+        public class LengthyOperationItem
+        {
             /// <summary>
             /// Defines the possible operation status values
             /// </summary>
-			public enum OperationStatus
-			{
+            public enum OperationStatus
+            {
                 /// <summary>
                 /// None
                 /// </summary>
-				None,
+                None,
+
                 /// <summary>
                 /// Pending
                 /// </summary>
-				Pending,
+                Pending,
+
                 /// <summary>
                 /// Success
                 /// </summary>
-				Success,
+                Success,
+
                 /// <summary>
                 /// Failure
                 /// </summary>
-				Failure
-			}
+                Failure
+            }
 
-			private string m_itempath;
-			private OperationStatus m_status;
+            private string m_itempath;
+            private OperationStatus m_status;
 
             /// <summary>
             /// Gets the item path
             /// </summary>
-			public string Itempath { get { return m_itempath; } }
+            public string Itempath { get { return m_itempath; } }
 
             /// <summary>
             /// Gets or sets the operation status
             /// </summary>
-			public OperationStatus Status 
-			{ 
-				get { return m_status; } 
-				set { m_status = value; }
-			}
+            public OperationStatus Status
+            {
+                get { return m_status; }
+                set { m_status = value; }
+            }
 
             /// <summary>
             /// Initializes a new instance of the <see cref="LengthyOperationItem"/> class.
             /// </summary>
             /// <param name="path">The path.</param>
-			public LengthyOperationItem(string path)
-			{
-				m_itempath = path;
-				m_status = OperationStatus.None;
-			}
-		}
-
-	}
-}
+            public LengthyOperationItem(string path)
+            {
+                m_itempath = path;
+                m_status = OperationStatus.None;
+            }
+        }
+    }
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/MaestroApiProviderAttribute.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/MaestroApiProviderAttribute.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/MaestroApiProviderAttribute.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI
 {
@@ -73,4 +74,4 @@
         /// </summary>
         public Type ImplType { get; set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/Collections.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/Collections.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/Collections.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Exceptions;
+using System;
 using System.Collections;
+using System.Collections.Generic;
 
 namespace OSGeo.MapGuide.MaestroAPI.Mapping
 {
@@ -38,6 +38,7 @@
         /// The internal list of value
         /// </summary>
         protected List<TVal> _values;
+
         /// <summary>
         /// The internal dictionary of values keyed by its key
         /// </summary>
@@ -85,7 +86,7 @@
         /// <exception cref="T:System.ArgumentOutOfRangeException">
         ///   <paramref name="index"/> is not a valid index in the <see cref="T:System.Collections.Generic.IList`1"/>.
         ///   </exception>
-        ///   
+        ///
         /// <exception cref="T:System.NotSupportedException">
         /// The <see cref="T:System.Collections.Generic.IList`1"/> is read-only.
         ///   </exception>
@@ -109,7 +110,7 @@
         /// <exception cref="T:System.ArgumentOutOfRangeException">
         ///   <paramref name="index"/> is not a valid index in the <see cref="T:System.Collections.Generic.IList`1"/>.
         ///   </exception>
-        ///   
+        ///
         /// <exception cref="T:System.NotSupportedException">
         /// The <see cref="T:System.Collections.Generic.IList`1"/> is read-only.
         ///   </exception>
@@ -135,11 +136,11 @@
         /// <returns>
         /// The element at the specified index.
         ///   </returns>
-        ///   
+        ///
         /// <exception cref="T:System.ArgumentOutOfRangeException">
         ///   <paramref name="index"/> is not a valid index in the <see cref="T:System.Collections.Generic.IList`1"/>.
         ///   </exception>
-        ///   
+        ///
         /// <exception cref="T:System.NotSupportedException">
         /// The property is set and the <see cref="T:System.Collections.Generic.IList`1"/> is read-only.
         ///   </exception>
@@ -214,7 +215,7 @@
         public virtual void Clear()
         {
             bool hasRemovedAnItem = false;
-            try 
+            try
             {
                 bSuppressCollectionChanged = true;
                 //We don't call Clear() directly because we need to propagate removal of each
@@ -237,7 +238,8 @@
                     _valuesByKey.Clear();
                 }
             }
-            finally {
+            finally
+            {
                 bSuppressCollectionChanged = false;
                 if (hasRemovedAnItem)
                     OnCollectionChanged();
@@ -264,11 +266,11 @@
         /// <exception cref="T:System.ArgumentNullException">
         ///   <paramref name="array"/> is null.
         ///   </exception>
-        ///   
+        ///
         /// <exception cref="T:System.ArgumentOutOfRangeException">
         ///   <paramref name="arrayIndex"/> is less than 0.
         ///   </exception>
-        ///   
+        ///
         /// <exception cref="T:System.ArgumentException">
         ///   <paramref name="array"/> is multidimensional.
         /// -or-
@@ -358,31 +360,31 @@
         /// <returns>
         /// The element at the specified index.
         ///   </returns>
-        ///   
+        ///
         /// <exception cref="T:System.ArgumentOutOfRangeException">
         ///   <paramref name="key"/> is not a valid index in the <see cref="T:System.Collections.Generic.IList`1"/>.
         ///   </exception>
-        ///   
+        ///
         /// <exception cref="T:System.NotSupportedException">
         /// The property is set and the <see cref="T:System.Collections.Generic.IList`1"/> is read-only.
         ///   </exception>
         public TVal this[TKey key]
         {
             get { return _valuesByKey.ContainsKey(key) ? _valuesByKey[key] : null; }
-            set 
-            { 
+            set
+            {
                 _valuesByKey[key] = value;
                 OnCollectionChanged();
             }
         }
-        
+
         /// <summary>
         /// Raised when the collection has been modified
         /// </summary>
         public event EventHandler CollectionChanged;
-        
+
         private bool bSuppressCollectionChanged = false;
-        
+
         /// <summary>
         /// Raises the <see cref="CollectionChanged" /> event
         /// </summary>
@@ -390,7 +392,7 @@
         {
             if (bSuppressCollectionChanged)
                 return;
-        
+
             var h = this.CollectionChanged;
             if (h != null)
                 h(this, EventArgs.Empty);
@@ -400,13 +402,17 @@
         /// Called before an item is added
         /// </summary>
         /// <param name="item">The item.</param>
-        protected virtual void OnBeforeItemAdded(TVal item) { }
+        protected virtual void OnBeforeItemAdded(TVal item)
+        {
+        }
 
         /// <summary>
         /// Called before an item is removed
         /// </summary>
         /// <param name="item">The item.</param>
-        protected virtual void OnBeforeItemRemove(TVal item) { }
+        protected virtual void OnBeforeItemRemove(TVal item)
+        {
+        }
 
         /// <summary>
         /// Called after an item has been added
@@ -546,7 +552,7 @@
         /// <exception cref="T:System.ArgumentOutOfRangeException">
         ///   <paramref name="index"/> is not a valid index in the <see cref="T:System.Collections.Generic.IList`1"/>.
         ///   </exception>
-        ///   
+        ///
         /// <exception cref="T:System.NotSupportedException">
         /// The <see cref="T:System.Collections.Generic.IList`1"/> is read-only.
         ///   </exception>
@@ -613,11 +619,11 @@
         /// <returns>
         /// The element at the specified index.
         ///   </returns>
-        ///   
+        ///
         /// <exception cref="T:System.ArgumentOutOfRangeException">
         ///   <paramref name="index"/> is not a valid index in the <see cref="T:System.Collections.Generic.IList`1"/>.
         ///   </exception>
-        ///   
+        ///
         /// <exception cref="T:System.NotSupportedException">
         /// The property is set and the <see cref="T:System.Collections.Generic.IList`1"/> is read-only.
         ///   </exception>
@@ -722,4 +728,4 @@
                 Remove(group);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/MapObservable.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/MapObservable.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/MapObservable.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.ComponentModel;
 
 namespace OSGeo.MapGuide.MaestroAPI.Mapping
@@ -46,9 +48,9 @@
         /// <returns></returns>
         protected bool SetField<T>(ref T field, T value, string propertyName)
         {
-            if (EqualityComparer<T>.Default.Equals(field, value)) 
+            if (EqualityComparer<T>.Default.Equals(field, value))
                 return false;
-            
+
             field = value;
             OnPropertyChanged(propertyName);
             return true;
@@ -94,4 +96,4 @@
         /// </summary>
         public event PropertyChangedEventHandler PropertyChanged;
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/MapSelection.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/MapSelection.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/MapSelection.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,9 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using OSGeo.MapGuide.MaestroAPI.Feature;
 using OSGeo.MapGuide.MaestroAPI.Serialization;
+using System;
+using System.Collections.Generic;
 using System.Xml;
-using OSGeo.MapGuide.MaestroAPI.Feature;
 
 namespace OSGeo.MapGuide.MaestroAPI.Mapping
 {
@@ -42,7 +41,7 @@
     ///     {
     ///         MapSelection.LayerSelection layerSel = selection[i];
     ///         sb.Append("<p>Layer: " + layerSel.Layer.Name + " (" + layerSel.Count + " selected item)");
-    ///         sb.Append("<table>");          
+    ///         sb.Append("<table>");
     ///         for (int j = 0; j < layerSel.Count; j++)
     ///         {
     ///             sb.Append("<tr>");
@@ -441,7 +440,7 @@
                 }
             }
 
-            #endregion
+            #endregion IList<object[]> Members
 
             #region ICollection<object[]> Members
 
@@ -504,7 +503,7 @@
                 return true;
             }
 
-            #endregion
+            #endregion ICollection<object[]> Members
 
             #region IEnumerable<object[]> Members
 
@@ -517,7 +516,7 @@
                 return m_list.GetEnumerator();
             }
 
-            #endregion
+            #endregion IEnumerable<object[]> Members
 
             #region IEnumerable Members
 
@@ -530,7 +529,7 @@
                 return ((System.Collections.IEnumerable)m_list).GetEnumerator();
             }
 
-            #endregion
+            #endregion IEnumerable Members
         }
 
         /// <summary>
@@ -687,7 +686,7 @@
             }
         }
 
-        #endregion
+        #endregion IList<MapSelection.LayerSelection> Members
 
         #region ICollection<MapSelection.LayerSelection> Members
 
@@ -752,11 +751,11 @@
         /// <exception cref="T:System.ArgumentNullException">
         ///   <paramref name="array"/> is null.
         ///   </exception>
-        ///   
+        ///
         /// <exception cref="T:System.ArgumentOutOfRangeException">
         ///   <paramref name="arrayIndex"/> is less than 0.
         ///   </exception>
-        ///   
+        ///
         /// <exception cref="T:System.ArgumentException">
         ///   <paramref name="array"/> is multidimensional.
         /// -or-
@@ -800,7 +799,7 @@
             return true;
         }
 
-        #endregion
+        #endregion ICollection<MapSelection.LayerSelection> Members
 
         #region IEnumerable<LayerSelection> Members
 
@@ -813,7 +812,7 @@
             return _layers.GetEnumerator();
         }
 
-        #endregion
+        #endregion IEnumerable<LayerSelection> Members
 
         #region IEnumerable Members
 
@@ -822,6 +821,6 @@
             return ((System.Collections.IEnumerable)_layers).GetEnumerator();
         }
 
-        #endregion
+        #endregion IEnumerable Members
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace OSGeo.MapGuide.MaestroAPI.Mapping
@@ -29,7 +29,7 @@
     /// persisting the <see cref="T:OSGeo.MapGuide.MaestroAPI.Mapping.RuntimeMap"/>
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMap.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMap.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMap.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Drawing;
-using System.Linq;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Commands;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Serialization;
@@ -30,6 +28,11 @@
 using OSGeo.MapGuide.ObjectModels.Common;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using OSGeo.MapGuide.ObjectModels.MapDefinition;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing;
+using System.Linq;
 
 namespace OSGeo.MapGuide.MaestroAPI.Mapping
 {
@@ -42,7 +45,7 @@
     /// <para>
     /// If you want to use this instance with the Rendering Service APIs, it is important to set the correct
     /// meters per unit value before calling the <see cref="T:OSGeo.MapGuide.MaestroAPI.Mapping.RuntimeMap.Save"/> method, as an incorrect meters
-    /// per unit value will produce incorrect images. 
+    /// per unit value will produce incorrect images.
     /// </para>
     /// <para>
     /// Also note that to improve the creation performance, certain implementations of <see cref="T:OSGeo.MapGuide.MaestroAPI.IServerConnection"/>
@@ -62,20 +65,20 @@
     /// <example>
     /// How to create a <see cref="RuntimeMap"/> with the correct meters per unit value using the MgCoordinateSystem API
     /// <code>
-    /// 
-    ///     IServerConnection conn = ConnectionProviderRegistry.CreateConnection("Maestro.Http", 
+    ///
+    ///     IServerConnection conn = ConnectionProviderRegistry.CreateConnection("Maestro.Http",
     ///         "Username", "Administrator",
     ///         "Password", "admin",
     ///         "Url", "http://localhost/mapguide/mapagent/mapagent.fcgi");
-    ///         
+    ///
     ///     //Create the Mapping Service. Some implementations of IServerConnection may not support this service, so
     ///     //its best to inspect the capability object of this connection to determine if this service type is supported
     ///     IMappingService mapSvc = (IMappingService)conn.GetService((int)ServiceType.Mapping);
-    /// 
+    ///
     ///     //Get our map definition
     ///     ResourceIdentifier resId = new ResourceIdentifier("Library://Samples/Sheboygan/Maps/Sheboygan.MapDefinition");
     ///     IMapDefinition mdf = (IMapDefinition)conn.ResourceService.GetResource(resId.ToString());
-    ///     
+    ///
     ///     //Calculate the meters per unit value, this requires the official MapGuide API. Otherwise, you need
     ///     //to know this value up-front in order to render images with this instance
     ///     double metersPerUnit = 1.0;
@@ -85,23 +88,23 @@
     ///         MgCoordinateSystem cs = factory.Create(mdf.CoordinateSystem);
     ///         metersPerUnit = cs.ConvertCoordinateSystemUnitsToMeters(1.0);
     ///     }
-    ///     
+    ///
     ///     //Generate our runtime map resource id. This must be session-based
     ///     ResourceIdentifier rtMapId = new ResourceIdentifier(resId.Name, ResourceTypes.RuntimeMap, conn.SessionID);
-    ///     
+    ///
     ///     //Create the runtime map using our meters per unit value
     ///     RuntimeMap map = mapSvc.CreateRuntimeMap(rtMapId, mdf, metersPerUnit);
-    ///     
+    ///
     ///     //Set some display parameters for this map
     ///     map.ViewScale = 75000;
     ///     map.DisplayWidth = 1024;
     ///     map.DisplayHeight = 1024;
     ///     map.DisplayDpi = 96;
-    /// 
-    ///     //We have to save it first before we can render from it or use any other API that requires this 
+    ///
+    ///     //We have to save it first before we can render from it or use any other API that requires this
     ///     //current map state. Remember to call Save() everytime you change the state of the map
     ///     map.Save();
-    ///     
+    ///
     ///     //Now we can render a map
     ///     using(Stream stream = mapSvc.RenderDynamicOverlay(map, null, "PNG"))
     ///     {
@@ -116,7 +119,7 @@
     ///             } while (read > 0);
     ///         }
     ///     }
-    /// 
+    ///
     /// </code>
     /// </example>
     public class RuntimeMap : MapObservable
@@ -136,6 +139,7 @@
         /// The mapping service
         /// </summary>
         protected IMappingService _mapSvc;
+
         /// <summary>
         /// The GetResourceContents command
         /// </summary>
@@ -200,7 +204,7 @@
             this.Groups = new RuntimeMapGroupCollection(this);
         }
 
-        static IEnumerable<string> GetLayerIds(IMapDefinition mdf)
+        private static IEnumerable<string> GetLayerIds(IMapDefinition mdf)
         {
             foreach (var layer in mdf.MapLayer)
             {
@@ -229,7 +233,7 @@
             this.DisplayHeight = height;
 
             var ext = this.MapExtent;
-            
+
             var orgX1 = ext.MinX;
             var orgY2 = ext.MinY;
             var orgX2 = ext.MaxX;
@@ -360,7 +364,10 @@
         /// </summary>
         /// <param name="index"></param>
         /// <returns></returns>
-        public double GetFiniteDisplayScaleAt(int index) { return _finiteDisplayScales[index]; }
+        public double GetFiniteDisplayScaleAt(int index)
+        {
+            return _finiteDisplayScales[index];
+        }
 
         /// <summary>
         /// Gets or sets the map extents. Inspect the <see cref="P:OSGeo.MapGuide.MaestroAPI.Mapping.RuntimeMap.SupportsMutableMapExtents"/>
@@ -373,7 +380,7 @@
             get;
             set;
         }
-        
+
         /// <summary>
         /// The data extent
         /// </summary>
@@ -615,14 +622,14 @@
         private string _resId;
 
         /// <summary>
-        /// Gets or sets the resource ID. When setting, if the name of this map has 
+        /// Gets or sets the resource ID. When setting, if the name of this map has
         /// not been specified already, the name will be set based on this resource id
         /// </summary>
         /// <value>The resource ID.</value>
         public string ResourceID
         {
             get { return _resId; }
-            set 
+            set
             {
                 SetField(ref _resId, value, "ResourceID"); //NOXLATE
                 if (this.Name == null)
@@ -732,7 +739,7 @@
             }
         }
 
-        enum WatermarkUsageType
+        private enum WatermarkUsageType
         {
             WMS = 1,
             Viewer = 2
@@ -770,6 +777,7 @@
             };
 
             public ChangeType Type { get; private set; }
+
             public string Params { get; private set; }
 
             public Change()
@@ -786,7 +794,9 @@
         internal class ChangeList
         {
             public string ObjectId { get; private set; }
+
             public bool IsLayer { get; private set; }
+
             public List<Change> Changes { get; private set; }
 
             public ChangeList()
@@ -891,7 +901,6 @@
                 this.ResourceID = d.ReadResourceIdentifier();
             }
 
-
             this.Name = d.ReadString();
             this.ObjectId = d.ReadString();
 
@@ -996,7 +1005,7 @@
                 {
                     c = changes[objid];
                 }
-                
+
                 int changeCount = d.ReadInt32();
                 while (changeCount-- > 0)
                 {
@@ -1004,7 +1013,6 @@
                     int ctype = d.ReadInt32();
                     c.Changes.Add(new Change((Change.ChangeType)ctype, d.ReadString()));
                 }
-                
             }
             return changes;
         }
@@ -1056,10 +1064,9 @@
                 {
                     _selection = new MapSelection(this);
                     var bLoadedSelection = ReloadSelection();
-                    
+
                     if (!bLoadedSelection)
                     {
-                    
                     }
                 }
                 return _selection;
@@ -1271,7 +1278,6 @@
             this.Groups.Remove(group);
         }
 
-
         /// <summary>
         /// Gets the layers of the specified group
         /// </summary>
@@ -1424,7 +1430,6 @@
             {
                 changes = new ChangeList(objectId, isLayer);
                 m_changeList.Add(objectId, changes);
-                
             }
             changes = m_changeList[objectId];
 
@@ -1520,7 +1525,7 @@
             if (h != null)
                 h(this, layer);
             //Fix the draw order of this layer that was added
-            
+
             //???
 
             TrackChange(layer.ObjectId, true, Change.ChangeType.added, string.Empty);
@@ -1558,9 +1563,10 @@
             TrackChange(layer.ObjectId, true, Change.ChangeType.definitionChanged, string.Empty);
         }
 
-        #endregion
+        #endregion change tracking
 
         #region convenience methods
+
         /// <summary>
         /// Convenience method for rendering a bitmap of the current map
         /// </summary>
@@ -1572,13 +1578,13 @@
                 throw new NotSupportedException();
 
             return _mapSvc.RenderRuntimeMap(
-                this, 
-                this.ViewCenter.X, 
-                this.ViewCenter.Y, 
-                this.ViewScale, 
-                this.DisplayWidth, 
-                this.DisplayHeight, 
-                this.DisplayDpi, 
+                this,
+                this.ViewCenter.X,
+                this.ViewCenter.Y,
+                this.ViewScale,
+                this.DisplayWidth,
+                this.DisplayHeight,
+                this.DisplayDpi,
                 format);
         }
 
@@ -1593,7 +1599,7 @@
         {
             return RenderDynamicOverlay(this.Selection, format, keepSelection);
         }
-        
+
         /// <summary>
         /// Convenience method for rendering a dynamic overlay of the current map
         /// </summary>
@@ -1697,7 +1703,7 @@
             return _mapSvc.GetLegendImage(scale, layerDefinitionID, themeCategory, geomType, width, height, format);
         }
 
-        #endregion
+        #endregion convenience methods
 
         internal bool StrictSelection { get; set; }
 
@@ -1817,7 +1823,7 @@
             }
 
             UpdateMapDefinition(newMdf);
-           
+
             return newMdf;
         }
 
@@ -1828,9 +1834,9 @@
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <param name="sender"></param>
     /// <param name="layer"></param>
     public delegate void LayerEventHandler(object sender, RuntimeMapLayer layer);
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapGroup.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapGroup.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapGroup.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Serialization;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.MaestroAPI.Serialization;
 
 namespace OSGeo.MapGuide.MaestroAPI.Mapping
 {
@@ -33,9 +34,10 @@
     {
         //From MgLayerGroupType
         internal const int kBaseMap = 2;
+
         internal const int kNormal = 1;
 
-        internal RuntimeMapGroup() 
+        internal RuntimeMapGroup()
         {
             _disableChangeTracking = true;
             this.Group = string.Empty;
@@ -49,7 +51,7 @@
         /// </summary>
         /// <param name="map">The map.</param>
         /// <param name="name">The name.</param>
-        protected internal RuntimeMapGroup(RuntimeMap map, string name) 
+        protected internal RuntimeMapGroup(RuntimeMap map, string name)
             : this()
         {
             this.Parent = map;
@@ -287,12 +289,15 @@
                     else
                         this.Parent.OnGroupParentChanged(this, string.Empty);
                     break;
+
                 case "Visible": //NOXLATE
                     this.Parent.OnGroupVisibilityChanged(this, this.Visible ? "1" : "0"); //NOXLATE
                     break;
+
                 case "ShowInLegend": //NOXLATE
                     this.Parent.OnGroupDisplayInLegendChanged(this, this.ShowInLegend ? "1" : "0"); //NOXLATE
                     break;
+
                 case "LegendLabel": //NOXLATE
                     this.Parent.OnGroupLegendLabelChanged(this, this.LegendLabel);
                     break;
@@ -301,4 +306,4 @@
             base.OnPropertyChanged(propertyName);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Mapping/RuntimeMapLayer.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,35 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Feature;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.MaestroAPI.Serialization;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.MaestroAPI.Serialization;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.MaestroAPI.Feature;
 using System.Diagnostics;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 
 namespace OSGeo.MapGuide.MaestroAPI.Mapping
 {
@@ -111,9 +113,10 @@
 
         //From MgLayerType
         internal const int kBaseMap = 2;
+
         internal const int kDynamic = 1;
 
-        const double InfinityScale = double.MaxValue;
+        private const double InfinityScale = double.MaxValue;
 
         /// <summary>
         /// Gets the <see cref="T:OSGeo.MapGuide.MaestroAPI.Mapping.RuntimeMap"/> that this layer belongs to
@@ -152,10 +155,10 @@
             {
                 _featureSourceId = ldf.SubLayer.ResourceId;
                 var dl = ((IDrawingLayerDefinition)ldf.SubLayer);
-                _scaleRanges = new double[] 
+                _scaleRanges = new double[]
                 {
                     dl.MinScale,
-                    dl.MaxScale 
+                    dl.MaxScale
                 };
                 EnsureOrderedMinMaxScales();
             }
@@ -172,7 +175,7 @@
         /// Initializes this instance
         /// </summary>
         /// <param name="parent"></param>
-        protected internal RuntimeMapLayer(RuntimeMap parent) 
+        protected internal RuntimeMapLayer(RuntimeMap parent)
         {
             _scaleRanges = new double[] { 0.0, InfinityScale };
             _type = kDynamic;
@@ -271,7 +274,7 @@
         /// <param name="source"></param>
         /// <param name="ldf"></param>
         /// <param name="suppressErrors"></param>
-        protected internal RuntimeMapLayer(RuntimeMap parent, IBaseMapLayer source, ILayerDefinition ldf, bool suppressErrors) 
+        protected internal RuntimeMapLayer(RuntimeMap parent, IBaseMapLayer source, ILayerDefinition ldf, bool suppressErrors)
             : this(parent, ldf, suppressErrors)
         {
             Check.NotNull(source, "source"); //NOXLATE
@@ -805,7 +808,7 @@
                     scaleRanges.Add(d.ReadDouble());
 
                 _scaleRanges = scaleRanges.ToArray();
-                
+
                 _featureSourceId = d.ReadString();
                 _qualifiedClassName = d.ReadString();
                 _geometryPropertyName = d.ReadString();
@@ -846,7 +849,7 @@
                     scaleRanges.Add(BitConverter.ToDouble(d.ReadStreamRepeat(8), 0));
 
                 _scaleRanges = scaleRanges.ToArray();
-                
+
                 _featureSourceId = d.ReadInternalString();
                 _qualifiedClassName = d.ReadInternalString();
                 if (d.SiteVersion > SiteVersions.GetVersion(KnownSiteVersions.MapGuideOS2_1))
@@ -872,22 +875,23 @@
         }
 
         //from MgPropertyType
-        const int Blob = 10;
-        const int Boolean = 1;
-        const int Byte = 2;
-        const int Clob = 11;
-        const int DateTime = 3;
-        const int Double = 5;
-        const int Feature = 12;
-        const int Geometry = 13;
-        const int Int16 = 6;
-        const int Int32 = 7;
-        const int Int64 = 8;
-        const int Null = 0;
-        const int Raster = 14;
-        const int Single = 4;
-        const int String = 9;
+        private const int Blob = 10;
 
+        private const int Boolean = 1;
+        private const int Byte = 2;
+        private const int Clob = 11;
+        private const int DateTime = 3;
+        private const int Double = 5;
+        private const int Feature = 12;
+        private const int Geometry = 13;
+        private const int Int16 = 6;
+        private const int Int32 = 7;
+        private const int Int64 = 8;
+        private const int Null = 0;
+        private const int Raster = 14;
+        private const int Single = 4;
+        private const int String = 9;
+
         private static short ConvertNetTypeToMgType(Type type)
         {
             if (type == typeof(short))
@@ -924,30 +928,43 @@
             {
                 case Byte:
                     return typeof(byte);
+
                 case Int16:
                     return typeof(short);
+
                 case Int32:
                     return typeof(int);
+
                 case Int64:
                     return typeof(long);
+
                 case Single:
                     return typeof(float);
+
                 case Double:
                     return typeof(double);
+
                 case Boolean:
                     return typeof(bool);
+
                 case Geometry:
                     return Utility.GeometryType;
+
                 case String:
                     return typeof(string);
+
                 case DateTime:
                     return typeof(DateTime);
+
                 case Raster:
                     return Utility.RasterType;
+
                 case Blob:
                     return typeof(byte[]);
+
                 case Clob:
                     return typeof(byte[]);
+
                 default:
                     throw new Exception(string.Format(Strings.ErrorFailedToFindTypeForClrType, idType));
             }
@@ -972,18 +989,23 @@
                     else
                         this.Parent.OnLayerParentChanged(this, string.Empty);
                     break;
+
                 case "Visible": //NOXLATE
                     this.Parent.OnLayerVisibilityChanged(this, this.Visible ? "1" : "0"); //NOXLATE
                     break;
+
                 case "ShowInLegend": //NOXLATE
                     this.Parent.OnLayerDisplayInLegendChanged(this, this.ShowInLegend ? "1" : "0"); //NOXLATE
                     break;
+
                 case "LegendLabel": //NOXLATE
                     this.Parent.OnLayerLegendLabelChanged(this, this.LegendLabel);
                     break;
+
                 case "LayerDefinitionID": //NOXLATE
                     this.Parent.OnLayerDefinitionChanged(this);
                     break;
+
                 case "Selectable": //NOXLATE
                     this.Parent.OnLayerSelectabilityChanged(this, this.Selectable ? "1" : "0"); //NOXLATE
                     break;
@@ -1002,7 +1024,7 @@
         /// <returns></returns>
         public bool IsVisibleAtScale(double scale)
         {
-            for (int i = 0; i < _scaleRanges.Length; i += 2) 
+            for (int i = 0; i < _scaleRanges.Length; i += 2)
             {
                 if (scale >= _scaleRanges[i] && scale <= _scaleRanges[i + 1])
                     return true;
@@ -1025,4 +1047,4 @@
         /// </summary>
         public string DisplayString { get { return this.LegendLabel + " (" + this.Name + ")"; } } //NOXLATE
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/MgServerConnectionBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/MgServerConnectionBase.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/MgServerConnectionBase.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,38 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Xml;
-using System.Text;
-using System.IO;
+//
 
-using ObjCommon = OSGeo.MapGuide.ObjectModels.Common;
-using AppDef = OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
-using OSGeo.MapGuide.ObjectModels.Capabilities;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI.Commands;
-using OSGeo.MapGuide.ObjectModels.LoadProcedure;
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Mapping;
-using System.Drawing;
 using OSGeo.MapGuide.MaestroAPI.Services;
+using System;
+using System.Drawing;
+using ObjCommon = OSGeo.MapGuide.ObjectModels.Common;
 
 namespace OSGeo.MapGuide.MaestroAPI
 {
@@ -87,11 +79,11 @@
         virtual public bool AutoRestartSession
         {
             get { return m_autoRestartSession; }
-            set 
+            set
             {
                 if (value && !_canAutoRestartSession)
                     throw new InvalidOperationException(Strings.ErrorConnectionCannotAutoRestartSession);
-                m_autoRestartSession = value; 
+                m_autoRestartSession = value;
             }
         }
 
@@ -171,7 +163,7 @@
         /// <returns></returns>
         protected abstract bool RestartSessionInternal(bool throwException);
 
-        #endregion
+        #endregion Session Management
 
         #region Site
 
@@ -203,12 +195,12 @@
         /// <returns>The list of groups</returns>
         abstract public ObjCommon.GroupList EnumerateGroups();
 
-        #endregion
+        #endregion Site
 
         #region Rendering
 
         /// <summary>
-        /// Identifies those features that meet the specified spatial selection criteria. This operation is used to implement server-side selection. In addition to a selection set, this operation returns attribute information in case only one feature is selected. 
+        /// Identifies those features that meet the specified spatial selection criteria. This operation is used to implement server-side selection. In addition to a selection set, this operation returns attribute information in case only one feature is selected.
         /// </summary>
         /// <param name="rtMap">The runtime map to identify features</param>
         /// <param name="maxFeatures">The maximum number of features to return</param>
@@ -327,6 +319,7 @@
         /// <param name="clip">if set to <c>true</c> [clip].</param>
         /// <returns></returns>
         public abstract System.IO.Stream RenderRuntimeMap(RuntimeMap map, double x, double y, double scale, int width, int height, int dpi, string format, bool clip);
+
         /// <summary>
         /// Renders the runtime map.
         /// </summary>
@@ -376,7 +369,7 @@
         /// <returns></returns>
         public abstract System.IO.Stream RenderDynamicOverlay(RuntimeMap map, MapSelection selection, string format, Color selectionColor, int behaviour);
 
-        #endregion
+        #endregion Rendering
 
         #region Tile
 
@@ -392,6 +385,6 @@
         /// <returns></returns>
         public abstract System.IO.Stream GetTile(string mapdefinition, string baselayergroup, int col, int row, int scaleindex, string format);
 
-        #endregion
+        #endregion Tile
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace OSGeo.MapGuide.MaestroAPI
@@ -28,7 +28,7 @@
     /// <c>OSGeo.MapGuide.MaestroAPI</c> is the root namespace of the Maestro API
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinition.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinition.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 using System;
 using System.Collections.Generic;
-using System.Text;
+using System.Collections.Specialized;
 using System.Xml;
 using System.Xml.Serialization;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
-using System.Collections.Specialized;
 
 #pragma warning disable 1591, 0114, 0108
 
@@ -48,7 +50,7 @@
 
     partial class ApplicationDefinitionType : IApplicationDefinition, IMapSet
     {
-        internal ApplicationDefinitionType() 
+        internal ApplicationDefinitionType()
         {
             this.Extension = new CustomContentType() { Any = new XmlElement[0] };
         }
@@ -68,18 +70,24 @@
             return map;
         }
 
-        public IWidgetItem CreateWidgetReference(string name) { return new WidgetItemType() { Function = UiItemFunctionType.Widget, Widget = name }; }
+        public IWidgetItem CreateWidgetReference(string name)
+        {
+            return new WidgetItemType() { Function = UiItemFunctionType.Widget, Widget = name };
+        }
 
-        public ISeparator CreateSeparator() { return new SeparatorItemType() { Function = UiItemFunctionType.Separator }; }
+        public ISeparator CreateSeparator()
+        {
+            return new SeparatorItemType() { Function = UiItemFunctionType.Separator };
+        }
 
-        public IFlyoutItem CreateFlyout(string label) 
-        { 
-            return new FlyoutItemType() 
-            { 
-                Function = UiItemFunctionType.Flyout, 
+        public IFlyoutItem CreateFlyout(string label)
+        {
+            return new FlyoutItemType()
+            {
+                Function = UiItemFunctionType.Flyout,
                 Label = label,
                 Item = new System.ComponentModel.BindingList<UiItemType>()
-            }; 
+            };
         }
 
         public IMapGroup AddMapGroup(string id, bool singleTile, string mapDefinitionId)
@@ -170,7 +178,7 @@
         }
 
         [XmlAttribute("noNamespaceSchemaLocation", Namespace = "http://www.w3.org/2001/XMLSchema-instance")] //NOXLATE
-        public string ValidatingSchema 
+        public string ValidatingSchema
         {
             get { return "ApplicationDefinition-1.0.0.xsd"; } //NOXLATE
             set { }
@@ -275,7 +283,7 @@
         [XmlIgnore]
         IEnumerable<IMapGroup> IMapSet.MapGroups
         {
-            get 
+            get
             {
                 foreach (var grp in this.MapSet)
                 {
@@ -313,7 +321,7 @@
         [XmlIgnore]
         public IEnumerable<IWidgetSet> WidgetSets
         {
-            get 
+            get
             {
                 foreach (var wset in this.WidgetSet)
                 {
@@ -451,7 +459,7 @@
         [XmlIgnore]
         public IEnumerable<IUIItem> Items
         {
-            get 
+            get
             {
                 foreach (var it in this.Item)
                 {
@@ -528,7 +536,7 @@
         }
     }
 
-    partial class UiItemType : IUIItem 
+    partial class UiItemType : IUIItem
     {
         [XmlIgnore]
         public IMenu Parent { get; set; }
@@ -543,7 +551,7 @@
         [XmlIgnore]
         public IEnumerable<IWidgetContainer> Containers
         {
-            get 
+            get
             {
                 foreach (var cnt in this.Container)
                 {
@@ -581,9 +589,9 @@
         [XmlIgnore]
         IMapWidget IWidgetSet.MapWidget
         {
-            get 
+            get
             {
-                return this.MapWidget;  
+                return this.MapWidget;
             }
         }
 
@@ -596,7 +604,7 @@
         [XmlIgnore]
         public IEnumerable<IWidget> Widgets
         {
-            get 
+            get
             {
                 foreach (var wgt in this.Widget)
                 {
@@ -633,7 +641,7 @@
         }
     }
 
-    partial class WidgetType : IWidget 
+    partial class WidgetType : IWidget
     {
         [XmlIgnore]
         IExtension IExtensibleElement.Extension
@@ -665,7 +673,7 @@
         }
     }
 
-    partial class UiWidgetType : IUIWidget 
+    partial class UiWidgetType : IUIWidget
     {
         IUIWidget IUIWidget.Clone()
         {
@@ -827,7 +835,7 @@
         [XmlIgnore]
         IEnumerable<IMap> IMapGroup.Map
         {
-            get 
+            get
             {
                 foreach (var map in this.Map)
                 {
@@ -868,7 +876,6 @@
 
     public class MapGuideOverlayOptions : IMapGuideOverlayOptions
     {
-
         public bool IsBaseLayer
         {
             get;
@@ -941,26 +948,26 @@
             {
                 if (this.extensionField.Any.Length > 0)
                 {
-                     var els = new List<XmlElement>(this.extensionField.Any);
-                     for (int i = 0; i < els.Count; i++)
-                     {
-                         if (els[i].Name.Equals("Options")) //NOXLATE
-                         {
-                             try
-                             {
-                                 var n = els[i]["name"]; //NOXLATE
-                                 var t = els[i]["type"]; //NOXLATE
+                    var els = new List<XmlElement>(this.extensionField.Any);
+                    for (int i = 0; i < els.Count; i++)
+                    {
+                        if (els[i].Name.Equals("Options")) //NOXLATE
+                        {
+                            try
+                            {
+                                var n = els[i]["name"]; //NOXLATE
+                                var t = els[i]["type"]; //NOXLATE
 
-                                 if (n != null && t != null)
-                                     return new MapOptions() { Name = n.InnerText, Type = t.InnerText };
-                             }
-                             catch
-                             {
-                                 return null;
-                             }
-                         }
-                     }
-                     return null;
+                                if (n != null && t != null)
+                                    return new MapOptions() { Name = n.InnerText, Type = t.InnerText };
+                            }
+                            catch
+                            {
+                                return null;
+                            }
+                        }
+                    }
+                    return null;
                 }
                 else
                 {
@@ -1035,12 +1042,12 @@
         {
             /*
             From Fusion Wiki:
-            
-            Note that the commercial layer must be the base layer so any overlays must 
-            have the isBaseLayer: false option set. The projection tag is needed so 
-            that OpenLayers will initialize the layer in the same projection as the base 
+
+            Note that the commercial layer must be the base layer so any overlays must
+            have the isBaseLayer: false option set. The projection tag is needed so
+            that OpenLayers will initialize the layer in the same projection as the base
             map.
-            
+
             <Options>
                <isBaseLayer>false</isBaseLayer>
                <useOverlay>true</useOverlay>
@@ -1157,4 +1164,4 @@
 
         public string Type { get; set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinitionInfo.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinitionInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinitionInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
+using System.Collections.Generic;
 
 #pragma warning disable 1591, 0114, 0108
 
@@ -34,7 +35,7 @@
         [XmlIgnore]
         IEnumerable<IWidgetInfo> IApplicationDefinitionWidgetInfoSet.WidgetInfo
         {
-            get 
+            get
             {
                 foreach (var w in this.WidgetInfo)
                 {
@@ -49,7 +50,7 @@
         [XmlIgnore]
         IEnumerable<IApplicationDefinitionContainerInfo> IApplicationDefinitionContainerInfoSet.ContainerInfo
         {
-            get 
+            get
             {
                 foreach (var c in this.ContainerInfo)
                 {
@@ -64,7 +65,7 @@
         [XmlIgnore]
         IEnumerable<IApplicationDefinitionTemplateInfo> IApplicationDefinitionTemplateInfoSet.TemplateInfo
         {
-            get 
+            get
             {
                 foreach (var t in this.TemplateInfo)
                 {
@@ -76,7 +77,6 @@
 
     partial class AllowedValueType : IAllowedValue
     {
-
     }
 
     partial class ApplicationDefinitionTemplateInfoType : IApplicationDefinitionTemplateInfo
@@ -84,7 +84,7 @@
         [XmlIgnore]
         IEnumerable<IApplicationDefinitionPanel> IApplicationDefinitionTemplateInfo.Panels
         {
-            get 
+            get
             {
                 foreach (var p in this.Panel)
                 {
@@ -96,12 +96,10 @@
 
     partial class ApplicationDefinitionContainerInfoType : IApplicationDefinitionContainerInfo
     {
-
     }
 
     partial class ApplicationDefinitionPanelType : IApplicationDefinitionPanel
     {
-
     }
 
     partial class ApplicationDefinitionWidgetInfoType : IWidgetInfo
@@ -115,7 +113,7 @@
         [XmlIgnore]
         public IWidgetParameter[] Parameters
         {
-            get 
+            get
             {
                 List<IWidgetParameter> param = new List<IWidgetParameter>();
                 foreach (var p in this.Parameter)
@@ -132,7 +130,7 @@
         [XmlIgnore]
         IAllowedValue[] IWidgetParameter.AllowedValue
         {
-            get 
+            get
             {
                 List<IAllowedValue> values = new List<IAllowedValue>();
                 foreach (var v in this.AllowedValue)
@@ -143,4 +141,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinitionInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinitionInterfaces.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ApplicationDefinitionInterfaces.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.Collections.Generic;
-using System.Text;
+using System.Collections.Specialized;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Xml;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI;
-using System.Collections.Specialized;
-using System.Diagnostics;
 
 #pragma warning disable 1591
 
@@ -281,6 +282,7 @@
     /// <param name="info"></param>
     /// <returns></returns>
     public delegate IWidget WidgetFactoryMethod(IWidgetInfo info);
+
     /// <summary>
     /// Factory method signature for creating fusion widget containers
     /// </summary>
@@ -297,22 +299,27 @@
         /// The preview template. Used for previewing other resources
         /// </summary>
         public const string Preview = "Preview"; //NOXLATE
+
         /// <summary>
         /// The Aqua template
         /// </summary>
         public const string Aqua = "Aqua"; //NOXLATE
+
         /// <summary>
         /// The Maroon template
         /// </summary>
         public const string Maroon = "Maroon"; //NOXLATE
+
         /// <summary>
         /// The Slate template
         /// </summary>
         public const string Slate = "Slate"; //NOXLATE
+
         /// <summary>
         /// The LimeGold template
         /// </summary>
         public const string LimeGold = "LimeGold"; //NOXLATE
+
         /// <summary>
         /// The TurquoiseYellow template
         /// </summary>
@@ -793,7 +800,7 @@
             {
                 names.Add(el.Name);
             }
-            
+
             return names.ToArray();
         }
 
@@ -987,7 +994,7 @@
 
 public class RangedWidgetValue : WidgetValue
 {
-    public RangedWidgetValue(string name, bool required, IComparable minValue, IComparable maxValue) : base(name, required) 
+    public RangedWidgetValue(string name, bool required, IComparable minValue, IComparable maxValue) : base(name, required)
     {
         Check.NotNull(minValue, "minValue"); //NOXLATE
         Check.NotNull(maxValue, "maxValue"); //NOXLATE
@@ -1217,7 +1224,6 @@
     /// </summary>
     public interface IUIItemContainer : IWidgetContainer, IMenu
     {
-        
     }
 
     /// <summary>
@@ -1314,7 +1320,6 @@
 
     public interface ISeparator : IUIItem
     {
-        
     }
 
     /// <summary>
@@ -1400,4 +1405,4 @@
         /// <value>The scale.</value>
         double Scale { get; set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/CommonTypes.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/CommonTypes.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/CommonTypes.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
 #pragma warning disable 1591, 0114, 0108, 0114, 0108
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.ComponentModel;
 using System.IO;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 
 namespace OSGeo.MapGuide.ObjectModels.Common
 {
@@ -87,6 +86,7 @@
         }
 
         #region Serialize/Deserialize
+
         /// <summary>
         /// Serializes current ExtendedDataType object into an XML document
         /// </summary>
@@ -257,9 +257,11 @@
                 }
             }
         }
-        #endregion
 
+        #endregion Serialize/Deserialize
+
         #region Clone method
+
         /// <summary>
         /// Create a clone of this ExtendedDataType object
         /// </summary>
@@ -267,7 +269,8 @@
         {
             return ((ExtendedDataType)(this.MemberwiseClone()));
         }
-        #endregion
+
+        #endregion Clone method
     }
 
     public interface IExpressionPropertySource
@@ -297,178 +300,222 @@
         /// BLOB data property
         /// </summary>
         Data_Blob,
+
         /// <summary>
         /// Boolean data property
         /// </summary>
         Data_Boolean,
+
         /// <summary>
         /// Byte data property
         /// </summary>
         Data_Byte,
+
         /// <summary>
         /// CLOB data property
         /// </summary>
         Data_Clob,
+
         /// <summary>
         /// DateTime data property
         /// </summary>
         Data_DateTime,
+
         /// <summary>
         /// Double data property
         /// </summary>
         Data_Double,
+
         /// <summary>
         /// Int16 data property
         /// </summary>
         Data_Int16,
+
         /// <summary>
         /// Int32 data property
         /// </summary>
         Data_Int32,
+
         /// <summary>
         /// Int64 data property
         /// </summary>
         Data_Int64,
+
         /// <summary>
         /// Single data property
         /// </summary>
         Data_Single,
+
         /// <summary>
         /// String data property
         /// </summary>
         Data_String,
+
         /// <summary>
         /// Geometry property
         /// </summary>
         Geometry,
+
         /// <summary>
         /// Raster property
         /// </summary>
         Raster,
+
         /// <summary>
         /// Association property
         /// </summary>
         Association,
+
         /// <summary>
         /// String symbol parameter
         /// </summary>
         Sym_String,
+
         /// <summary>
         /// Boolean symbol parameter
         /// </summary>
         Sym_Boolean,
+
         /// <summary>
         /// Integer symbol parameter
         /// </summary>
         Sym_Integer,
+
         /// <summary>
         /// Real symbol parameter
         /// </summary>
         Sym_Real,
+
         /// <summary>
         /// Color symbol parameter
         /// </summary>
         Sym_Color,
+
         /// <summary>
         /// Angle symbol parameter
         /// </summary>
         Sym_Angle,
+
         /// <summary>
         /// Fill color symbol parameter
         /// </summary>
         Sym_FillColor,
+
         /// <summary>
         /// Line color symbol parameter
         /// </summary>
         Sym_LineColor,
+
         /// <summary>
         /// Line weight symbol parameter
         /// </summary>
         Sym_LineWeight,
+
         /// <summary>
         /// Content symbol parameter
         /// </summary>
         Sym_Content,
+
         /// <summary>
         /// Markup symbol parameter
         /// </summary>
         Sym_Markup,
+
         /// <summary>
         /// Font name symbol parameter
         /// </summary>
         Sym_FontName,
+
         /// <summary>
         /// Bold symbol parameter
         /// </summary>
         Sym_Bold,
+
         /// <summary>
         /// Italic symbol parameter
         /// </summary>
         Sym_Italic,
+
         /// <summary>
         /// Underlined symbol parameter
         /// </summary>
         Sym_Underlined,
+
         /// <summary>
         /// Overlined symbol parameter
         /// </summary>
         Sym_Overlined,
+
         /// <summary>
         /// Oblique angle symbol parameter
         /// </summary>
         Sym_ObliqueAngle,
+
         /// <summary>
         /// Track spacing symbol parameter
         /// </summary>
         Sym_TrackSpacing,
+
         /// <summary>
         /// Font height symbol parameter
         /// </summary>
         Sym_FontHeight,
+
         /// <summary>
         /// Horizontal alignment symbol parameter
         /// </summary>
         Sym_HorizontalAlignment,
+
         /// <summary>
         /// Vertical alignment symbol parameter
         /// </summary>
         Sym_VerticalAlignment,
+
         /// <summary>
         /// Justification symbol parameter
         /// </summary>
         Sym_Justification,
+
         /// <summary>
         /// Line spacing symbol parameter
         /// </summary>
         Sym_LineSpacing,
+
         /// <summary>
         /// Text color symbol parameter
         /// </summary>
         Sym_TextColor,
+
         /// <summary>
         /// Ghost color symbol parameter
         /// </summary>
         Sym_GhostColor,
+
         /// <summary>
         /// Frame line color symbol parameter
         /// </summary>
         Sym_FrameLineColor,
+
         /// <summary>
         /// Frame fill color symbol parameter
         /// </summary>
         Sym_FrameFillColor,
+
         /// <summary>
         /// Start offset symbol parameter
         /// </summary>
         Sym_StartOffset,
+
         /// <summary>
         /// End offset symbol parameter
         /// </summary>
         Sym_EndOffset,
+
         /// <summary>
         /// Repeat X symbol parameter
         /// </summary>
         Sym_RepeatX,
+
         /// <summary>
         /// Repeat Y symbol parameter
         /// </summary>
@@ -486,4 +533,4 @@
         /// <value>The resource id.</value>
         string ResourceId { get; set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/DrawingSource.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/DrawingSource.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/DrawingSource.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels.Common;
+using OSGeo.MapGuide.ObjectModels.DrawingSource;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.Xml.Serialization;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels.DrawingSource;
 
 #pragma warning disable 1591, 0114, 0108
 
@@ -32,7 +34,9 @@
 {
     partial class DrawingSource : IDrawingSource
     {
-        internal DrawingSource() { }
+        internal DrawingSource()
+        {
+        }
 
         private static readonly Version RES_VERSION = new Version(1, 0, 0);
 
@@ -90,7 +94,7 @@
         }
 
         [XmlAttribute("noNamespaceSchemaLocation", Namespace = "http://www.w3.org/2001/XMLSchema-instance")] //NOXLATE
-        public string ValidatingSchema 
+        public string ValidatingSchema
         {
             get { return "DrawingSource-1.0.0.xsd"; } //NOXLATE
             set { }
@@ -110,7 +114,7 @@
         [XmlIgnore]
         IEnumerable<IDrawingSourceSheet> IDrawingSource.Sheet
         {
-            get 
+            get
             {
                 foreach (var sht in this.Sheet)
                 {
@@ -180,4 +184,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/DrawingSourceInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/DrawingSourceInterfaces.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/DrawingSourceInterfaces.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels.Common;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
 using System.IO;
 
 namespace OSGeo.MapGuide.ObjectModels.DrawingSource
@@ -123,7 +125,6 @@
                 foreach (var sht in sheets.Section)
                 {
                     source.AddSheet(source.CreateSheet(sht.Name, 0, 0, 0, 0));
-
                 }
             }
             return bRegen;
@@ -198,4 +199,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/Envelope.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/Envelope.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/Envelope.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
 using System.ComponentModel;
-using OSGeo.MapGuide.MaestroAPI;
 
 #pragma warning disable 1591, 0114, 0108
 
@@ -149,7 +149,9 @@
 
     partial class Envelope : IEnvelope
     {
-        internal Envelope() { }
+        internal Envelope()
+        {
+        }
 
         public Envelope(double minx, double miny, double maxx, double maxy)
         {
@@ -163,8 +165,8 @@
         public double MinX
         {
             get { return this.lowerLeftCoordinateField.X; }
-            set 
-            { 
+            set
+            {
                 this.lowerLeftCoordinateField.X = value;
                 OnPropertyChanged("MinX"); //NOXLATE
             }
@@ -176,8 +178,8 @@
         public double MinY
         {
             get { return this.lowerLeftCoordinateField.Y; }
-            set 
-            { 
+            set
+            {
                 this.lowerLeftCoordinateField.Y = value;
                 OnPropertyChanged("MinY"); //NOXLATE
             }
@@ -189,8 +191,8 @@
         public double MaxX
         {
             get { return this.upperRightCoordinateField.X; }
-            set 
-            { 
+            set
+            {
                 this.upperRightCoordinateField.X = value;
                 OnPropertyChanged("MaxX");
             }
@@ -202,11 +204,11 @@
         public double MaxY
         {
             get { return this.upperRightCoordinateField.Y; }
-            set 
-            { 
+            set
+            {
                 this.upperRightCoordinateField.Y = value;
                 OnPropertyChanged("MaxY"); //NOXLATE
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/FdoCapabilities.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/FdoCapabilities.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/FdoCapabilities.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,26 @@
 #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
-using System;
-using System.Collections.Generic;
+//
+
+#endregion Disclaimer / License
+
 using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 namespace OSGeo.MapGuide.ObjectModels.Capabilities
@@ -28,91 +28,125 @@
     public interface IFdoCommandCapabilities
     {
         string[] SupportedCommands { get; }
+
         bool SupportsParameters { get; }
+
         bool SupportsTimeout { get; }
     }
 
     public interface IFdoConnectionCapabilities
     {
         string[] SupportedSpatialContextExtentTypes { get; }
+
         bool SupportsConfiguration { get; }
+
         bool SupportsLocking { get; }
+
         bool SupportsLongTransactions { get; }
+
         bool SupportsSQL { get; }
+
         bool SupportsTimeout { get; }
+
         bool SupportsTransactions { get; }
+
         string ThreadCapability { get; }
     }
 
     public interface IFdoExpressionCapabilities
     {
         IFdoFunctionDefintion[] SupportedFunctions { get; }
+
         string[] ExpressionTypes { get; }
     }
 
     public interface IFdoFunctionArgumentDefinition
     {
         string Name { get; }
+
         string Description { get; }
     }
 
     public interface IFdoFunctionDefintionSignature
     {
         IFdoFunctionArgumentDefinition[] Arguments { get; }
+
         string ReturnType { get; }
     }
 
     public interface IFdoFunctionDefintion
     {
         string Name { get; }
+
         string Description { get; }
+
         IFdoFunctionDefintionSignature[] Signatures { get; }
     }
 
     public interface IFdoFilterCapabilities
     {
         string[] ConditionTypes { get; }
+
         string[] DistanceOperations { get; }
+
         string[] SpatialOperations { get; }
 
         bool SupportsGeodesicDistance { get; }
+
         bool SupportsNonLiteralGeometricOperations { get; }
     }
 
     public interface IFdoGeometryCapabilities
     {
         string[] SupportedComponentTypes { get; }
+
         string Dimensionality { get; }
+
         string[] SupportedGeometryTypes { get; }
     }
 
     public interface IFdoRasterCapabilities
     {
         bool SupportsRaster { get; }
+
         bool SupportsStitching { get; }
+
         bool SupportsSubsampling { get; }
     }
 
     public interface IFdoSchemaCapabilities
     {
         string[] SupportedClassTypes { get; }
+
         string[] SupportedDataTypes { get; }
+
         bool SupportsAssociationProperties { get; }
+
         bool SupportsInheritance { get; }
+
         bool SupportsMultipleSchemas { get; }
+
         bool SupportsNetworkModel { get; }
+
         bool SupportsObjectProperties { get; }
+
         bool SupportsSchemaOverrides { get; }
     }
 
     public interface IFdoProviderCapabilities
     {
         IFdoCommandCapabilities Command { get; }
+
         IFdoConnectionCapabilities Connection { get; }
+
         IFdoExpressionCapabilities Expression { get; }
+
         IFdoFilterCapabilities Filter { get; }
-        IFdoGeometryCapabilities Geometry { get;  }
+
+        IFdoGeometryCapabilities Geometry { get; }
+
         IFdoRasterCapabilities Raster { get; }
+
         IFdoSchemaCapabilities Schema { get; }
     }
 
@@ -184,7 +218,6 @@
             get { return this.ArgumentDefinitionList.ToArray(); }
         }
 
-
         [XmlIgnore]
         public IFdoFunctionDefintionSignature[] Signatures
         {
@@ -194,7 +227,6 @@
 
     partial class FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition : IFdoFunctionArgumentDefinition
     {
-
     }
 
     partial class FdoProviderCapabilitiesExpression : IFdoExpressionCapabilities
@@ -250,7 +282,6 @@
 
     partial class FdoProviderCapabilitiesRaster : IFdoRasterCapabilities
     {
-
     }
 
     partial class FdoProviderCapabilitiesSchema : IFdoSchemaCapabilities
@@ -342,7 +373,6 @@
         }
     }
 
-
     partial class FdoProviderCapabilitiesExpressionFunctionDefinitionSignatureDefinition : IFdoFunctionDefintionSignature
     {
         [XmlIgnore]
@@ -360,7 +390,6 @@
 
     partial class FdoProviderCapabilitiesExpressionFunctionDefinitionSignatureDefinitionArgumentDefinitionListArgumentDefinition : IFdoFunctionArgumentDefinition
     {
-
     }
 
     partial class FdoProviderCapabilitiesExpression : IFdoExpressionCapabilities
@@ -416,7 +445,6 @@
 
     partial class FdoProviderCapabilitiesRaster : IFdoRasterCapabilities
     {
-
     }
 
     partial class FdoProviderCapabilitiesSchema : IFdoSchemaCapabilities
@@ -433,4 +461,4 @@
             get { return this.Data.Select(x => x.ToString()).ToArray(); }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSource.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSource.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSource.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
+using System.ComponentModel;
 using System.Xml.Serialization;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using System.ComponentModel;
 
 #pragma warning disable 1591, 0114, 0108
 
@@ -33,7 +34,9 @@
 {
     partial class FeatureSourceType : IFeatureSource
     {
-        internal FeatureSourceType() { }
+        internal FeatureSourceType()
+        {
+        }
 
         private static readonly Version RES_VERSION = new Version(1, 0, 0);
 
@@ -93,7 +96,7 @@
         }
 
         [XmlAttribute("noNamespaceSchemaLocation", Namespace = "http://www.w3.org/2001/XMLSchema-instance")] //NOXLATE
-        public string ValidatingSchema 
+        public string ValidatingSchema
         {
             get { return "FeatureSource-1.0.0.xsd"; } //NOXLATE
             set { }
@@ -212,7 +215,7 @@
                 return connStr.Substring(tagIndex + StringConstants.MgDataFilePath.Length, end - (tagIndex + StringConstants.MgDataFilePath.Length));
         }
 
-        const string ALIAS_PREFIX = "%MG_DATA_PATH_ALIAS["; //NOXLATE
+        private const string ALIAS_PREFIX = "%MG_DATA_PATH_ALIAS["; //NOXLATE
 
         /// <summary>
         /// Gets the name of the alias. Can only be called if <see cref="UsesAliasedDataFiles"/> returns true
@@ -349,7 +352,7 @@
         [XmlIgnore]
         IEnumerable<ICalculatedProperty> IFeatureSourceExtension.CalculatedProperty
         {
-            get 
+            get
             {
                 foreach (var calc in this.CalculatedProperty)
                 {
@@ -375,7 +378,7 @@
         [XmlIgnore]
         IEnumerable<IAttributeRelation> IFeatureSourceExtension.AttributeRelate
         {
-            get 
+            get
             {
                 foreach (var rel in this.AttributeRelate)
                 {
@@ -441,7 +444,7 @@
         [XmlIgnore]
         IEnumerable<IRelateProperty> IAttributeRelation.RelateProperty
         {
-            get 
+            get
             {
                 foreach (var rel in this.RelateProperty)
                 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSourceInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSourceInterfaces.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSourceInterfaces.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,35 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.ObjectModels.Common;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.MaestroAPI;
+using System.Collections.Specialized;
 using System.ComponentModel;
 using System.IO;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using System.Collections.Specialized;
+using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.FeatureSource
 {
@@ -99,7 +102,7 @@
         /// <value>
         /// 	<c>true</c> if [uses embedded data files]; otherwise, <c>false</c>.
         /// </value>
-        bool UsesEmbeddedDataFiles{ get; }
+        bool UsesEmbeddedDataFiles { get; }
 
         /// <summary>
         /// Gets a value indicating whether [uses aliased data files].
@@ -248,7 +251,6 @@
     [System.SerializableAttribute()]
     public enum RelateTypeEnum
     {
-
         /// <remarks/>
         LeftOuter,
 
@@ -481,7 +483,7 @@
         /// </summary>
         /// <remarks>
         /// If you only need to list schemas and class names, use the respective <see cref="M:OSGeo.MapGuide.MaestroAPI.Services.IFeatureService.GetSchemas" /> and
-        /// <see cref="M:OSGeo.MapGuide.MaestroAPI.Services.IFeatureService.GetClassNames" /> methods. Using this API will have a noticeable performance impact on 
+        /// <see cref="M:OSGeo.MapGuide.MaestroAPI.Services.IFeatureService.GetClassNames" /> methods. Using this API will have a noticeable performance impact on
         /// really large datastores (whose size is in the 100s of classes).
         /// </remarks>
         /// <returns></returns>
@@ -566,7 +568,6 @@
             fs.AddSpatialContextOverride(new OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0.SpatialContextType() { Name = name, CoordinateSystem = coordSys });
         }
 
-
         /// <summary>
         /// Tests the connection settings in this feature source
         /// </summary>
@@ -590,4 +591,4 @@
             rel.AddRelateProperty(new OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0.RelatePropertyType() { FeatureClassProperty = primary, AttributeClassProperty = secondary });
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/Geometries.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/Geometries.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/Geometries.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.ObjectModels.Common
 {
     /// <summary>
@@ -53,6 +52,7 @@
     internal class Point2DImpl : IPoint2D
     {
         public double X { get; set; }
+
         public double Y { get; set; }
     }
 
@@ -60,4 +60,4 @@
     {
         public double Z { get; set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/GridLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/GridLayerDefinitionImpl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/GridLayerDefinitionImpl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108
@@ -35,6 +37,7 @@
 #elif LDF_240
 namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_2_4_0
 #else
+
 namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_0_0
 #endif
 {
@@ -84,7 +87,7 @@
         [XmlIgnore]
         IEnumerable<IGridScaleRange> IRasterLayerDefinition.GridScaleRange
         {
-            get 
+            get
             {
                 foreach (var gsr in this.GridScaleRange)
                 {
@@ -306,7 +309,6 @@
         }
     }
 
-
     partial class GridColorType : IGridColor
     {
         [XmlIgnore]
@@ -323,9 +325,11 @@
                     case ItemChoiceType.Band:
                         this.Item = ((ExplicitColorBand)value).Band;
                         break;
+
                     case ItemChoiceType.Bands:
                         this.Item = ((ExplicitColorBands)value).Bands;
                         break;
+
                     case ItemChoiceType.ExplicitColor:
                         this.Item = ((ExplicitColor)value).Value;
                         break;
@@ -342,8 +346,10 @@
             {
                 case ItemChoiceType.Band:
                     return new ExplicitColorBand() { Band = (string)this.Item };
+
                 case ItemChoiceType.Bands:
                     return new ExplicitColorBands() { Bands = (IGridColorBands)this.Item };
+
                 case ItemChoiceType.ExplicitColor:
                     return new ExplicitColor() { Value = (string)this.Item };
             }
@@ -534,7 +540,7 @@
         [XmlIgnore]
         IEnumerable<IGridColorRule> IGridColorStyle.ColorRule
         {
-            get 
+            get
             {
                 foreach (var cr in this.ColorRule)
                 {
@@ -550,7 +556,6 @@
                 this.ColorRule.Add((GridColorRuleType)cr);
         }
 
-
         void IGridColorStyle.RemoveColorRule(IGridColorRule rule)
         {
             var cr = rule as GridColorRuleType;
@@ -720,5 +725,4 @@
             return new GridSurfaceStyleType();
         }
     }
-
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/IFdoSpatialContext.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/IFdoSpatialContext.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/IFdoSpatialContext.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 #pragma warning disable 1591, 0114, 0108, 0114, 0108
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Globalization;
 using System.Xml.Serialization;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using System.Globalization;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace OSGeo.MapGuide.ObjectModels.Common
 {
@@ -315,4 +316,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/IRepositoryItem.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/IRepositoryItem.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/IRepositoryItem.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace OSGeo.MapGuide.ObjectModels.Common
 {
-
     /// <summary>
     /// Represents an item in the repository
     /// </summary>
@@ -80,5 +79,4 @@
         /// <value>The modified date.</value>
         DateTime ModifiedDate { get; }
     }
-
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerFactory.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerFactory.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerFactory.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.MaestroAPI;
 using System.Drawing;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.IO;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 
 #pragma warning disable 1591, 0114, 0108
 
@@ -40,6 +41,7 @@
 #elif LDF_240
 namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_2_4_0
 #else
+
 namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_0_0
 #endif
 {
@@ -106,13 +108,15 @@
         {
             var lyr = new LayerDefinition();
             switch (type)
-            { 
+            {
                 case LayerType.Drawing:
                     lyr.CreateDrawingLayer();
                     break;
+
                 case LayerType.Raster:
                     lyr.CreateRasterLayer();
                     break;
+
                 case LayerType.Vector:
                     lyr.CreateVectorLayer();
                     break;
@@ -161,13 +165,13 @@
             {
                 ColorStyle = new GridColorStyleType()
                 {
-                    ColorRule = new System.ComponentModel.BindingList<GridColorRuleType>() 
-                    { 
-                        new GridColorRuleType() { 
+                    ColorRule = new System.ComponentModel.BindingList<GridColorRuleType>()
+                    {
+                        new GridColorRuleType() {
                             LegendLabel = string.Empty,
-                            Color = new GridColorType() 
+                            Color = new GridColorType()
                         },
-                        new GridColorRuleType() { 
+                        new GridColorRuleType() {
                             LegendLabel = string.Empty,
                             Color = new GridColorType()
                         }
@@ -275,7 +279,6 @@
         {
             IMarkSymbol sym = new MarkSymbolType()
             {
-                
                 SizeContext = SizeContextType.DeviceUnits,
                 MaintainAspect = true,
                 Shape = ShapeType.Square,
@@ -380,7 +383,6 @@
             };
         }
 
-
         public IW2DSymbol CreateDefaultW2DSymbol(string symbolLibrary, string symbolName)
         {
             return new W2DSymbolType()
@@ -403,7 +405,7 @@
                 LegendLabel = string.Empty,
                 CompositeSymbolization = new CompositeSymbolization()
                 {
-                    SymbolInstance = new System.ComponentModel.BindingList<SymbolInstance>()  
+                    SymbolInstance = new System.ComponentModel.BindingList<SymbolInstance>()
                 }
             };
 #endif
@@ -458,4 +460,4 @@
 #endif
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaceExtensions.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaceExtensions.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaceExtensions.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,35 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using System.Drawing;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels.DrawingSource;
-using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
 
 namespace OSGeo.MapGuide.ObjectModels.LayerDefinition
 {
@@ -171,6 +172,7 @@
                             return scList.SpatialContext[0].CoordinateSystemWkt;
                     }
                     break;
+
                 case LayerType.Vector:
                     {
                         var vl = (IVectorLayerDefinition)layer.SubLayer;
@@ -180,6 +182,7 @@
                             return scList.SpatialContext[0].CoordinateSystemWkt;
                     }
                     break;
+
                 case LayerType.Drawing:
                     {
                         int[] services = conn.Capabilities.SupportedServices;
@@ -197,7 +200,7 @@
             return string.Empty;
         }
 
-        static IFdoSpatialContext FindSpatialContext(FdoSpatialContextList spatialContexts, string scName)
+        private static IFdoSpatialContext FindSpatialContext(FdoSpatialContextList spatialContexts, string scName)
         {
             foreach (IFdoSpatialContext sc in spatialContexts.SpatialContext)
             {
@@ -298,7 +301,7 @@
                             env = conn.FeatureService.GetSpatialExtent(layer.SubLayer.ResourceId, ((IVectorLayerDefinition)layer.SubLayer).FeatureName, ((IVectorLayerDefinition)layer.SubLayer).Geometry);
                             return env;
                         }
-                        catch 
+                        catch
                         {
                             //Which in that case, default to extents of active spatial context
                             if (activeSc != null && activeSc.Extent != null)
@@ -555,14 +558,14 @@
             var rule = fact.CreateDefaultCompositeRule();
             //Clear out existing instances
             rule.CompositeSymbolization.RemoveAllSymbolInstances();
-            
+
             var ldf = (ILayerDefinition)fact;
-            var vl  = (IVectorLayerDefinition)ldf.SubLayer;
+            var vl = (IVectorLayerDefinition)ldf.SubLayer;
 
             string symbolName = "Square"; //NOXLATE
 
-            var ssym = ObjectFactory.CreateSimpleSymbol(ldf.CurrentConnection, 
-                                                        vl.SymbolDefinitionVersion, 
+            var ssym = ObjectFactory.CreateSimpleSymbol(ldf.CurrentConnection,
+                                                        vl.SymbolDefinitionVersion,
                                                         symbolName,
                                                         "Default Point Symbol"); //NOXLATE
 
@@ -572,7 +575,7 @@
             square.LineColor = "%LINECOLOR%"; //NOXLATE
             square.LineWeight = "%LINEWEIGHT%"; //NOXLATE
             ssym.AddGraphics(square);
-            
+
             ssym.PointUsage = ssym.CreatePointUsage();
             ssym.PointUsage.Angle = "%ROTATION%"; //NOXLATE
 
@@ -774,4 +777,4 @@
             return style;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
+using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using System.Drawing;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI;
 using System.ComponentModel;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 
 namespace OSGeo.MapGuide.ObjectModels.LayerDefinition
 {
@@ -41,7 +38,6 @@
     [System.SerializableAttribute()]
     public enum LengthUnitType
     {
-
         /// <remarks/>
         Millimeters,
 
@@ -76,7 +72,6 @@
     [System.SerializableAttribute()]
     public enum SizeContextType
     {
-
         /// <remarks/>
         MappingUnits,
 
@@ -90,7 +85,6 @@
     [System.SerializableAttribute()]
     public enum ShapeType
     {
-
         /// <remarks/>
         Square,
 
@@ -116,7 +110,6 @@
     [System.SerializableAttribute()]
     public enum BackgroundStyleType
     {
-
         /// <remarks/>
         Transparent,
 
@@ -133,7 +126,6 @@
     [System.SerializableAttribute()]
     public enum FeatureNameType
     {
-
         /// <remarks/>
         FeatureClass,
 
@@ -148,7 +140,6 @@
     [System.Xml.Serialization.XmlTypeAttribute(IncludeInSchema = false)]
     public enum ItemChoiceType
     {
-
         /// <remarks/>
         Band,
 
@@ -159,7 +150,7 @@
         ExplicitColor,
     }
 
-    #endregion
+    #endregion core enums
 
     #region core
 
@@ -172,10 +163,12 @@
         /// DWF-based drawing layer
         /// </summary>
         Drawing,
+
         /// <summary>
         /// Vector layer
         /// </summary>
         Vector,
+
         /// <summary>
         /// Raster layer
         /// </summary>
@@ -271,7 +264,7 @@
         /// </summary>
         /// <returns></returns>
         IPointSymbolization2D CreateDefaultPointSymbolization2D();
-        
+
         /// <summary>
         /// Creates a default stroke
         /// </summary>
@@ -305,7 +298,7 @@
         /// </summary>
         /// <returns></returns>
         ILineRule CreateDefaultLineRule();
-        
+
         /// <summary>
         /// Creates a default point rule
         /// </summary>
@@ -484,7 +477,7 @@
 
         /// <summary>
         /// Gets the property mappings for this layer. This determines which properties
-        /// are displayed (and what labels to use) in the property pane and 
+        /// are displayed (and what labels to use) in the property pane and
         /// </summary>
         IEnumerable<INameStringPair> PropertyMapping { get; }
 
@@ -573,6 +566,7 @@
         /// The content.
         /// </value>
         string Content { get; set; }
+
         /// <summary>
         /// Gets or sets the description of the URL. This can be a string FDO expression
         /// </summary>
@@ -580,6 +574,7 @@
         /// The description.
         /// </value>
         string Description { get; set; }
+
         /// <summary>
         /// Gets or sets the override of URL content for a specific feature which can be a string FDO expression
         /// </summary>
@@ -587,6 +582,7 @@
         /// The content override.
         /// </value>
         string ContentOverride { get; set; }
+
         /// <summary>
         /// Gets or sets the override of URL description for a specific feature which can be a string FDO expression
         /// </summary>
@@ -679,7 +675,7 @@
         double MaxScale { get; set; }
     }
 
-    #endregion
+    #endregion core
 
     #region vector layer
 
@@ -723,7 +719,7 @@
     /// <summary>
     /// The stylization to be applied to the vector features for a given scale range. Supports elevation, extrusion settings
     /// and Advanced Stylization through composite styles
-    /// 
+    ///
     /// Supported by Layer Definition 1.1.0 and higher
     /// </summary>
     public interface IVectorScaleRange2 : IVectorScaleRange
@@ -793,19 +789,22 @@
     public enum StyleType
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Area,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Line,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Point,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Composite
     }
@@ -877,18 +876,21 @@
         /// <param name="index"></param>
         /// <returns></returns>
         IVectorRule GetRuleAt(int index);
+
         /// <summary>
         /// Gets the index of the specified rule
         /// </summary>
         /// <param name="rule">The rule.</param>
         /// <returns></returns>
         int IndexOfRule(IVectorRule rule);
+
         /// <summary>
         /// Moves the specified rule up the list
         /// </summary>
         /// <param name="rule">The rule.</param>
         /// <returns></returns>
         bool MoveUp(IVectorRule rule);
+
         /// <summary>
         /// Moves the specified rule down the list
         /// </summary>
@@ -909,18 +911,21 @@
         /// <param name="rule"></param>
         /// <returns></returns>
         int IndexOfRule(TRule rule);
+
         /// <summary>
         /// Gets the rule at the specified index
         /// </summary>
         /// <param name="index">The index.</param>
         /// <returns></returns>
         TRule GetRuleAt(int index);
+
         /// <summary>
         /// Moves the specified rule up the list
         /// </summary>
         /// <param name="rule">The rule.</param>
         /// <returns></returns>
         bool MoveUp(TRule rule);
+
         /// <summary>
         /// Moves the specified rule down the list
         /// </summary>
@@ -970,7 +975,7 @@
     /// <summary>
     /// Base interface for style rules of all geometric types
     /// </summary>
-    public interface IVectorRule 
+    public interface IVectorRule
     {
         /// <summary>
         /// Gets or sets the label for the rule to be displayed in the legend
@@ -1045,7 +1050,7 @@
     public interface IAreaRule : IBasicVectorRule
     {
         /// <summary>
-        /// Gets or sets the polygon stylization settings 
+        /// Gets or sets the polygon stylization settings
         /// </summary>
         IAreaSymbolizationFill AreaSymbolization2D { get; set; }
     }
@@ -1113,22 +1118,27 @@
         /// A textual symbol
         /// </summary>
         Text,
+
         /// <summary>
         /// A predefined shape such as a square or circle.
         /// </summary>
         Mark,
+
         /// <summary>
         /// A raster or image symbol.  Note that these do not scale well, but sometimes this is all that you have.  Supported formats are application specific.
         /// </summary>
         Image,
+
         /// <summary>
         /// A symbol specified using a font character
         /// </summary>
         Font,
+
         /// <summary>
         /// A vector symbol defined using a W2D stream
         /// </summary>
         W2D,
+
         /// <summary>
         /// A vector symbol specifed from a block
         /// </summary>
@@ -1360,17 +1370,18 @@
     public enum ImageSymbolReferenceType
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         SymbolReference,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Inline
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     public interface IBaseImageSymbol
     {
@@ -1469,7 +1480,7 @@
         string ForegroundColor { get; set; }
     }
 
-    #endregion
+    #endregion vector layer
 
     #region raster layer
 
@@ -1782,7 +1793,7 @@
         IGridSurfaceStyle CreateSurfaceStyle();
     }
 
-    #endregion
+    #endregion raster layer
 
     #region Layer Definition 1.1.0 interfaces
 
@@ -1792,7 +1803,6 @@
     [System.SerializableAttribute()]
     public enum ElevationTypeType
     {
-
         /// <remarks/>
         RelativeToGround,
 
@@ -1978,16 +1988,19 @@
         /// </summary>
         /// <value>The Z offset.</value>
         string ZOffset { get; set; }
+
         /// <summary>
         /// Gets or sets the Z extrusion.
         /// </summary>
         /// <value>The Z extrusion.</value>
         string ZExtrusion { get; set; }
+
         /// <summary>
         /// Gets or sets the type of the Z offset.
         /// </summary>
         /// <value>The type of the Z offset.</value>
         ElevationTypeType ZOffsetType { get; set; }
+
         /// <summary>
         /// Gets or sets the unit.
         /// </summary>
@@ -1995,7 +2008,7 @@
         LengthUnitType Unit { get; set; }
     }
 
-    #endregion
+    #endregion Layer Definition 1.1.0 interfaces
 
     #region Layer Definition 1.2.0 interfaces
 
@@ -2005,7 +2018,6 @@
     [System.SerializableAttribute()]
     public enum UsageContextType
     {
-
         /// <remarks/>
         Unspecified,
 
@@ -2025,7 +2037,6 @@
     [System.SerializableAttribute()]
     public enum GeometryContextType
     {
-
         /// <remarks/>
         Unspecified,
 
@@ -2091,7 +2102,7 @@
         GeometryContextType GeometryContext { get; set; }
     }
 
-    #endregion
+    #endregion Layer Definition 1.2.0 interfaces
 
     #region Layer Definition 1.3.0 interfaces
 
@@ -2143,8 +2154,5 @@
         bool ShowInLegend { get; set; }
     }
 
-    #endregion
-
-    #region Layer Definition 2.3.0 interfaces
-    #endregion
-}
+    #endregion Layer Definition 1.3.0 interfaces
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcFactory.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcFactory.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcFactory.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,10 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.ObjectModels.LoadProcedure;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels.LoadProcedure;
 using System.IO;
-using OSGeo.MapGuide.MaestroAPI;
 
 #pragma warning disable 1591, 0114, 0108
 
@@ -13,6 +10,7 @@
 #elif LP220
 namespace OSGeo.MapGuide.ObjectModels.LoadProcedure_2_2_0
 #else
+
 namespace OSGeo.MapGuide.ObjectModels.LoadProcedure_1_0_0
 #endif
 {
@@ -21,7 +19,7 @@
     /// </summary>
     public static class LoadProcEntryPoint
     {
-        const string ARBITRARY_XYM = "LOCAL_CS[\"Non-Earth (Meter)\", LOCAL_DATUM[\"Local Datum\", 0], UNIT[\"Meter\", 1], AXIS[\"X\", EAST], AXIS[\"Y\", NORTH]]"; //NOXLATE
+        private const string ARBITRARY_XYM = "LOCAL_CS[\"Non-Earth (Meter)\", LOCAL_DATUM[\"Local Datum\", 0], UNIT[\"Meter\", 1], AXIS[\"X\", EAST], AXIS[\"Y\", NORTH]]"; //NOXLATE
 
         private static void ApplyDefaults(LoadProcedureType lt)
         {
@@ -91,4 +89,4 @@
 
 #endif
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcedure.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcedure.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcedure.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels.LoadProcedure;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.Xml.Serialization;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.LoadProcedure;
 
 #pragma warning disable 1591, 0114, 0108
 
@@ -32,6 +34,7 @@
 #elif LP220
 namespace OSGeo.MapGuide.ObjectModels.LoadProcedure_2_2_0
 #else
+
 namespace OSGeo.MapGuide.ObjectModels.LoadProcedure_1_0_0
 #endif
 {
@@ -99,9 +102,8 @@
         }
 
         [XmlAttribute("noNamespaceSchemaLocation", Namespace = "http://www.w3.org/2001/XMLSchema-instance")] //NOXLATE
-        public string ValidatingSchema 
-        { 
-
+        public string ValidatingSchema
+        {
 #if LP110
             get { return "LoadProcedure-1.1.0.xsd"; } //NOXLATE
 #elif LP220
@@ -262,4 +264,4 @@
         }
     }
 #endif
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcedureInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcedureInterfaces.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcedureInterfaces.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.ComponentModel;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace OSGeo.MapGuide.ObjectModels.LoadProcedure
 {
@@ -51,22 +52,27 @@
         /// A Load Procedure for SDF 3.0 files
         /// </summary>
         Sdf,
+
         /// <summary>
         /// A Load Procedure for SHP files
         /// </summary>
         Shp,
+
         /// <summary>
         /// A Load Procedure for DWF files
         /// </summary>
         Dwf,
+
         /// <summary>
         /// A Load Procedure for Raster files (not supported by Maestro)
         /// </summary>
         Raster,
+
         /// <summary>
         /// A Load Procedure for DWG files (not supported by Maestro)
         /// </summary>
         Dwg,
+
         /// <summary>
         /// A Load Procedure for SQLite files
         /// </summary>
@@ -90,7 +96,6 @@
     /// </summary>
     public interface IDwgLoadProcedure : IBaseLoadProcedure
     {
-
     }
 
     /// <summary>
@@ -98,13 +103,12 @@
     /// </summary>
     public interface IRasterLoadProcedure : IBaseLoadProcedure
     {
-
     }
 
     /// <summary>
-    /// Base type of all load procedures. All Load Procedures at the minimum require 
+    /// Base type of all load procedures. All Load Procedures at the minimum require
     /// the following information:
-    /// 
+    ///
     /// <list type="number">
     ///     <item>
     ///         <description>A list of source files.</description>
@@ -119,9 +123,9 @@
     ///         <description>The folder where layers will be created [optional. dependent on #3]</description>
     ///     </item>
     /// </list>
-    /// 
+    ///
     /// Once initialized, load procedures can be executed via <see cref="M:OSGeo.MapGuide.MaestroAPI.MgServerConnectionBase.ExecuteLoadProcedure(OSGeo.MapGuide.ObjectModels.LoadProcedure.ILoadProcedure,OSGeo.MapGuide.MaestroAPI.LengthyOperationProgressCallBack,System.Boolean)"/> method
-    /// 
+    ///
     /// Because Load Procedures are also resources, they can be saved into the library repository via the <see cref="M:OSGeo.MapGuide.MaestroAPI.Services.IResourceService.SaveResource(OSGeo.MapGuide.MaestroAPI.Resource.IResource)"/> method
     /// and retrieved from the repository via the <see cref="M:OSGeo.MapGuide.MaestroAPI.Services.IResourceService.GetResource(System.String)"/> method
     /// </summary>
@@ -270,7 +274,6 @@
     /// </summary>
     public interface IDwfLoadProcedure : IBaseLoadProcedure
     {
-
     }
 
     /// <summary>
@@ -335,4 +338,4 @@
         /// </summary>
         double Generalization { get; set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LongTransaction.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LongTransaction.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LongTransaction.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 
 namespace OSGeo.MapGuide.ObjectModels.Common
 {
@@ -59,15 +56,14 @@
         /// </summary>
         public IEnumerable<ILongTransaction> Transactions
         {
-            get 
+            get
             {
-                return this.LongTransaction;            
+                return this.LongTransaction;
             }
         }
     }
 
     partial class FdoLongTransactionListLongTransaction : ILongTransaction
     {
-
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/MapDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/MapDefinition.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/MapDefinition.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,49 +1,55 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
-using System.Xml.Serialization;
-using OSGeo.MapGuide.MaestroAPI;
-using System.Drawing;
+using OSGeo.MapGuide.ObjectModels.Common;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.ObjectModels.Common;
 using OSGeo.MapGuide.ObjectModels.MapDefinition;
+using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel;
-using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
+using System.Drawing;
 using System.IO;
+using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108
 
 #if MDF_240
 namespace OSGeo.MapGuide.ObjectModels.MapDefinition_2_4_0
 #elif MDF_230
+
 namespace OSGeo.MapGuide.ObjectModels.MapDefinition_2_3_0
 #else
+
 namespace OSGeo.MapGuide.ObjectModels.MapDefinition_1_0_0
 #endif
 {
     partial class MapDefinitionType
     {
-        internal MapDefinitionType() { }
+        internal MapDefinitionType()
+        {
+        }
 
         [XmlIgnore]
         public Color BackgroundColor
@@ -111,11 +117,11 @@
 
     partial class MapDefinition : IMapDefinition
 #if MDF_230 || MDF_240
-        , IMapDefinition2
+, IMapDefinition2
 #endif
     {
-        internal MapDefinition() 
-        { 
+        internal MapDefinition()
+        {
 #if MDF_240
             this.versionField = "2.4.0"; //NOXLATE
 #elif MDF_230
@@ -183,7 +189,9 @@
             }
         }
 
-        internal void SortGroupList() { }
+        internal void SortGroupList()
+        {
+        }
 
         object ICloneable.Clone()
         {
@@ -193,8 +201,8 @@
         }
 
         [XmlAttribute("noNamespaceSchemaLocation", Namespace = "http://www.w3.org/2001/XMLSchema-instance")] //NOXLATE
-        public string ValidatingSchema 
-        { 
+        public string ValidatingSchema
+        {
 #if MDF_240
             get { return "MapDefinition-2.4.0.xsd"; } //NOXLATE
 #elif MDF_230
@@ -283,7 +291,8 @@
             {
                 Check.Precondition(this.GetGroupByName(groupName) != null, "There should be an existing group for <groupName>"); //NOXLATE
             }
-            var layer = new MapLayerType() { 
+            var layer = new MapLayerType()
+            {
                 Parent = this,
                 ExpandInLegend = true,
                 LegendLabel = layerName,
@@ -294,7 +303,7 @@
                 Selectable = true
             };
             layer.Group = string.IsNullOrEmpty(groupName) ? string.Empty : groupName;
-            
+
             this.MapLayer.Insert(0, layer);
             OnPropertyChanged("MapLayer"); //NOXLATE
 
@@ -429,9 +438,9 @@
         private static bool IsEmpty(Box2DType box2DType)
         {
             return box2DType == null ||
-                (box2DType.MaxX == 0.0 && 
-                box2DType.MaxY == 0.0 && 
-                box2DType.MinX == 0.0 && 
+                (box2DType.MaxX == 0.0 &&
+                box2DType.MaxY == 0.0 &&
+                box2DType.MinX == 0.0 &&
                 box2DType.MinY == 0.0);
         }
 
@@ -491,7 +500,7 @@
         [XmlIgnore]
         IEnumerable<IMapLayer> IMapDefinition.MapLayer
         {
-            get 
+            get
             {
                 foreach (var layer in this.MapLayer)
                 {
@@ -513,7 +522,7 @@
         [XmlIgnore]
         IEnumerable<IMapLayerGroup> IMapDefinition.MapLayerGroup
         {
-            get 
+            get
             {
                 foreach (var grp in this.MapLayerGroup)
                 {
@@ -682,11 +691,11 @@
             if (isrc > 0)
             {
                 var src = this.MapLayer[isrc];
-             
+
                 //take everything before this and shift them up one position
                 for (int i = isrc - 1; i >= 0; i--)
                 {
-                    this.MapLayer[i+1] = this.MapLayer[i];
+                    this.MapLayer[i + 1] = this.MapLayer[i];
                 }
 
                 this.MapLayer[0] = src;
@@ -714,21 +723,22 @@
         }
 
 #if MDF_230 || MDF_240
-        IEnumerable<OSGeo.MapGuide.ObjectModels.WatermarkDefinition.IWatermark> IWatermarkCollection.Watermarks
+
+        IEnumerable<IWatermark> IWatermarkCollection.Watermarks
         {
-            get 
+            get
             {
                 foreach (var wm in this.Watermarks)
                     yield return wm;
             }
         }
 
-        IWatermark IWatermarkCollection.AddWatermark(OSGeo.MapGuide.ObjectModels.WatermarkDefinition.IWatermarkDefinition watermark)
+        IWatermark IWatermarkCollection.AddWatermark(IWatermarkDefinition watermark)
         {
             return WatermarkCollectionUtil.AddWatermark(this.Watermarks, watermark);
         }
 
-        void IWatermarkCollection.RemoveWatermark(OSGeo.MapGuide.ObjectModels.WatermarkDefinition.IWatermark watermark)
+        void IWatermarkCollection.RemoveWatermark(IWatermark watermark)
         {
             WatermarkCollectionUtil.RemoveWatermark(this.Watermarks, watermark);
         }
@@ -737,6 +747,7 @@
         {
             get { return this.Watermarks.Count; }
         }
+
 #endif
     }
 
@@ -782,7 +793,7 @@
         [XmlIgnore]
         IEnumerable<double> IBaseMapDefinition.FiniteDisplayScale
         {
-            get 
+            get
             {
                 foreach (var scale in this.FiniteDisplayScale)
                 {
@@ -810,7 +821,7 @@
         [XmlIgnore]
         IEnumerable<IBaseMapGroup> IBaseMapDefinition.BaseMapLayerGroup
         {
-            get 
+            get
             {
                 foreach (var grp in this.BaseMapLayerGroup)
                 {
@@ -829,7 +840,7 @@
                 ExpandInLegend = true,
                 ShowInLegend = true,
                 LegendLabel = name,
-                Visible = true                
+                Visible = true
             };
             this.BaseMapLayerGroup.Add(grp);
 
@@ -846,7 +857,6 @@
 
     partial class MapLayerType : IMapLayer
     {
-
     }
 
     partial class BaseMapLayerType : IBaseMapLayer
@@ -881,7 +891,7 @@
         [XmlIgnore]
         IEnumerable<IBaseMapLayer> IBaseMapGroup.BaseMapLayer
         {
-            get 
+            get
             {
                 foreach (var lyr in this.BaseMapLayer)
                 {
@@ -986,4 +996,4 @@
             return -1;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/MapDefinitionInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/MapDefinitionInterfaces.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/MapDefinitionInterfaces.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels.Common;
+using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Drawing;
-using System.ComponentModel;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 
 namespace OSGeo.MapGuide.ObjectModels.MapDefinition
 {
@@ -64,6 +65,7 @@
         /// based on that layer's added extents. Default is false
         /// </summary>
         bool SetExtentsFromFirstAddedLayer { get; set; }
+
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
@@ -133,7 +135,7 @@
         IMapLayer InsertLayer(int index, string groupName, string layerName, string layerDefinitionId);
 
         /// <summary>
-        /// Adds a layer to this map. If this is the first layer to be added, the coordinate system 
+        /// Adds a layer to this map. If this is the first layer to be added, the coordinate system
         /// of this map and its extents will be set to the coordinate system and extents of this layer
         /// if this has not been set already.
         /// </summary>
@@ -148,7 +150,7 @@
         IMapLayer AddLayer(string groupName, string layerName, string resourceId);
 
         /// <summary>
-        /// Adds a layer to this map. If this is the first layer to be added, the coordinate system 
+        /// Adds a layer to this map. If this is the first layer to be added, the coordinate system
         /// of this map and its extents will be set to the coordinate system and extents of this layer
         /// if this has not been set already.
         /// </summary>
@@ -261,7 +263,6 @@
     /// </summary>
     public interface IMapDefinition2 : IMapDefinition, IWatermarkCollection
     {
-        
     }
 
     /// <summary>
@@ -961,4 +962,4 @@
         /// <value>The parent map definition.</value>
         IMapDefinition Parent { get; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace OSGeo.MapGuide.ObjectModels
@@ -28,12 +28,12 @@
     /// The <c>OSGeo.MapGuide.ObjectModels</c> namespace is the root of all classes generated from the MapGuide
     /// XML Schemas. MapGuide resources are provided as strongly-typed classes implementing common interfaces to avoid
     /// needing to work against version specific resources.
-    /// 
+    ///
     /// The <see cref="T:OSGeo.MapGuide.ObjectModels.ObjectFactory"/> utility class is used for creating any of these
     /// resource classes.
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
 
@@ -44,7 +44,7 @@
         /// Application Definition resources
         /// </summary>
         [CompilerGenerated]
-        class NamespaceDoc
+        internal class NamespaceDoc
         {
         }
     }
@@ -53,11 +53,11 @@
     {
         /// <summary>
         /// The <c>OSGeo.MapGuide.ObjectModels.Capabilities</c> namespace provides classes for working with common
-        /// elements in mapagent GETPROVIDERCAPABILITIES responses. The classes have been automatically generated from the 
+        /// elements in mapagent GETPROVIDERCAPABILITIES responses. The classes have been automatically generated from the
         /// respective MapGuide XML schemas.
         /// </summary>
         [CompilerGenerated]
-        class NamespaceDoc
+        internal class NamespaceDoc
         {
         }
     }
@@ -70,7 +70,7 @@
         /// XML schemas.
         /// </summary>
         [CompilerGenerated]
-        class NamespaceDoc
+        internal class NamespaceDoc
         {
         }
     }
@@ -82,7 +82,7 @@
         /// Drawing Source resources
         /// </summary>
         [CompilerGenerated]
-        class NamespaceDoc
+        internal class NamespaceDoc
         {
         }
     }
@@ -94,7 +94,7 @@
         /// Feature Source resources
         /// </summary>
         [CompilerGenerated]
-        class NamespaceDoc
+        internal class NamespaceDoc
         {
         }
     }
@@ -106,7 +106,7 @@
         /// Layer Definition resources
         /// </summary>
         [CompilerGenerated]
-        class NamespaceDoc
+        internal class NamespaceDoc
         {
         }
     }
@@ -118,7 +118,7 @@
         /// Load Procedure resources
         /// </summary>
         [CompilerGenerated]
-        class NamespaceDoc
+        internal class NamespaceDoc
         {
         }
     }
@@ -130,7 +130,7 @@
         /// Map Definition resources
         /// </summary>
         [CompilerGenerated]
-        class NamespaceDoc
+        internal class NamespaceDoc
         {
         }
     }
@@ -142,7 +142,7 @@
         /// Print Layout resources
         /// </summary>
         [CompilerGenerated]
-        class NamespaceDoc
+        internal class NamespaceDoc
         {
         }
     }
@@ -154,7 +154,7 @@
         /// Symbol Definition resources
         /// </summary>
         [CompilerGenerated]
-        class NamespaceDoc
+        internal class NamespaceDoc
         {
         }
     }
@@ -166,7 +166,7 @@
         /// Symbol Library resources
         /// </summary>
         [CompilerGenerated]
-        class NamespaceDoc
+        internal class NamespaceDoc
         {
         }
     }
@@ -178,7 +178,7 @@
         /// Watermark Definition resources
         /// </summary>
         [CompilerGenerated]
-        class NamespaceDoc
+        internal class NamespaceDoc
         {
         }
     }
@@ -190,8 +190,8 @@
         /// Web Layout resources
         /// </summary>
         [CompilerGenerated]
-        class NamespaceDoc
+        internal class NamespaceDoc
         {
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ObjectFactory.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ObjectFactory.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ObjectFactory.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Services;
-using Res = OSGeo.MapGuide.MaestroAPI.Properties.Resources;
 using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
+using OSGeo.MapGuide.ObjectModels.ApplicationDefinition_1_0_0;
 using OSGeo.MapGuide.ObjectModels.Common;
 using OSGeo.MapGuide.ObjectModels.DrawingSource;
 using OSGeo.MapGuide.ObjectModels.FeatureSource;
@@ -34,11 +32,11 @@
 using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using OSGeo.MapGuide.ObjectModels.PrintLayout;
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-using OSGeo.MapGuide.ObjectModels.SymbolLibrary;
+using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 using OSGeo.MapGuide.ObjectModels.WebLayout;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition_1_0_0;
+using System;
+using System.Collections.Generic;
 using System.Collections.Specialized;
-using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 
 namespace OSGeo.MapGuide.ObjectModels
 {
@@ -46,27 +44,33 @@
     /// Factory method signature for creating layer definitions
     /// </summary>
     public delegate ILayerDefinition LayerCreatorFunc(LayerType type);
+
     /// <summary>
     /// Factory method signature for creating load procedures
     /// </summary>
     public delegate ILoadProcedure LoadProcCreatorFunc();
+
     /// <summary>
     /// Factory method signature for creating web layouts
     /// </summary>
     public delegate IWebLayout WebLayoutCreatorFunc(string mapDefinitionId);
+
     /// <summary>
     /// Factory method signature for creating compound symbol definitions
     /// </summary>
     public delegate ICompoundSymbolDefinition CompoundSymbolDefCreatorFunc();
+
     /// <summary>
     /// Factory method signature for creating simple symbol definitions
     /// </summary>
     public delegate ISimpleSymbolDefinition SimpleSymbolDefCreatorFunc();
+
     /// <summary>
     /// Factory method signature for creating watermarks
     /// </summary>
     /// <returns></returns>
     public delegate IWatermarkDefinition WatermarkCreatorFunc(SymbolDefinitionType type);
+
     /// <summary>
     /// Factory method signature for creating map definitions
     /// </summary>
@@ -78,14 +82,14 @@
     /// sensible default values. This is recommended over creating the objects directly
     /// as this ensures that there are no null child properties where the XML schema forbids
     /// it.
-    /// 
+    ///
     /// By default this class will only create v1.0.0 of any specified top-level resource unless specified. In order to be able to create
     /// newer versions, you need to register the appropriate methods that can create resources of this version:
-    /// 
+    ///
     ///  - <see cref="RegisterLayerFactoryMethod"/> for Layer Definitions
-    ///  
+    ///
     /// This registration needs to be done as part of your application's startup/initialization phase.
-    /// 
+    ///
     /// In the context of Maestro, this registration is automatically done as part of the addin's startup process
     /// </summary>
     public static class ObjectFactory
@@ -97,10 +101,10 @@
         private static Dictionary<Version, CompoundSymbolDefCreatorFunc> _compoundSymbolFactories;
         private static Dictionary<Version, MapDefinitionCreatorFunc> _mapDefinitionFactories;
         private static Dictionary<Version, WatermarkCreatorFunc> _watermarkFactories;
-        
+
         static ObjectFactory()
         {
-            _layerFactories = new Dictionary<Version,LayerCreatorFunc>();
+            _layerFactories = new Dictionary<Version, LayerCreatorFunc>();
             _wlFactories = new Dictionary<Version, WebLayoutCreatorFunc>();
             _loadProcFactories = new Dictionary<LoadType, LoadProcCreatorFunc>();
             _simpleSymbolFactories = new Dictionary<Version, SimpleSymbolDefCreatorFunc>();
@@ -111,7 +115,7 @@
             _layerFactories.Add(
                 new Version(1, 0, 0),
                 new LayerCreatorFunc(OSGeo.MapGuide.ObjectModels.LayerDefinition_1_0_0.LdfEntryPoint.CreateDefault));
-            
+
             _loadProcFactories.Add(
                 LoadType.Sdf,
                 new LoadProcCreatorFunc(OSGeo.MapGuide.ObjectModels.LoadProcedure_1_0_0.LoadProcEntryPoint.CreateDefaultSdf));
@@ -251,7 +255,7 @@
         }
 
         /// <summary>
-        /// Creates the web layout. The schema version used is the highest supported one by the connection 
+        /// Creates the web layout. The schema version used is the highest supported one by the connection
         /// </summary>
         /// <param name="owner"></param>
         /// <param name="mapDefinitionId"></param>
@@ -290,7 +294,7 @@
 
             var layer = _layerFactories[version](type);
             layer.CurrentConnection = owner;
-            
+
             return layer;
         }
 
@@ -303,8 +307,8 @@
         {
             Check.NotNull(owner, "owner"); //NOXLATE
 
-            return new OSGeo.MapGuide.ObjectModels.DrawingSource_1_0_0.DrawingSource() 
-            { 
+            return new OSGeo.MapGuide.ObjectModels.DrawingSource_1_0_0.DrawingSource()
+            {
                 CurrentConnection = owner,
                 SourceName = string.Empty,
                 CoordinateSpace = string.Empty,
@@ -523,6 +527,7 @@
                         sym.LineUsage = usage;
                     }
                     break;
+
                 case GeometryContextType.Polygon:
                     {
                         var usage = sym.CreateAreaUsage();
@@ -532,6 +537,7 @@
                         sym.AreaUsage = usage;
                     }
                     break;
+
                 case GeometryContextType.Point:
                     {
                         var usage = sym.CreatePointUsage();
@@ -567,7 +573,7 @@
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="owner"></param>
         /// <param name="version"></param>
@@ -705,7 +711,7 @@
         }
 
         /// <summary>
-        /// Creates a simple symbol definition. The schema version used is the highest supported one by the connection 
+        /// Creates a simple symbol definition. The schema version used is the highest supported one by the connection
         /// </summary>
         /// <param name="owner"></param>
         /// <param name="name"></param>
@@ -740,7 +746,7 @@
         }
 
         /// <summary>
-        /// Creates the compound symbol. The schema version used is the highest supported one by the connection 
+        /// Creates the compound symbol. The schema version used is the highest supported one by the connection
         /// </summary>
         /// <param name="owner"></param>
         /// <param name="name"></param>
@@ -752,7 +758,7 @@
             return CreateCompoundSymbol(owner, ver, name, description);
         }
 
-        static readonly string[] parameterizedWidgets = 
+        private static readonly string[] parameterizedWidgets =
         {
             KnownWidgetNames.CTRLClick,
             KnownWidgetNames.ZoomOnClick,
@@ -775,7 +781,7 @@
             return vert;
         }
 
-        static Version VER_240 = new Version(2, 4);
+        private static Version VER_240 = new Version(2, 4);
 
         /// <summary>
         /// Creates a fusion flexible layout
@@ -792,7 +798,7 @@
 
             var fusionSvc = (IFusionService)owner.GetService((int)ServiceType.Fusion);
             var templates = fusionSvc.GetApplicationTemplates();
-            
+
             var appDef = DeserializeEmbeddedFlexLayout();
             //Find matching template.
             var tpl = templates.FindTemplate(templateName);
@@ -803,10 +809,10 @@
             }
             appDef.CurrentConnection = owner;
             return appDef;
-            */ 
-            
+            */
+
             Check.Precondition(Array.IndexOf(owner.Capabilities.SupportedServices, (int)ServiceType.Fusion) >= 0, "Required Fusion service not supported on this connection");
-            
+
             IApplicationDefinition appDef = new ApplicationDefinitionType()
             {
                 CurrentConnection = owner,
@@ -830,9 +836,9 @@
             }
             else
             {
-                //NOTE: Depending on MapGuide Server version, this document may be 
+                //NOTE: Depending on MapGuide Server version, this document may be
                 //invalid (eg. References to widgets not available in that version)
-                return DeserializeEmbeddedFlexLayout(owner); 
+                return DeserializeEmbeddedFlexLayout(owner);
             }
 
             //Toolbars, every template has them
@@ -1002,10 +1008,10 @@
             toolbar.AddItem(appDef.CreateWidgetReference(KnownWidgetNames.SelectRadius));
             toolbar.AddItem(appDef.CreateWidgetReference(KnownWidgetNames.SelectPolygon));
             toolbar.AddItem(appDef.CreateWidgetReference(KnownWidgetNames.ClearSelection));
-            
+
             toolbar.AddItem(appDef.CreateWidgetReference(buffer.Name));
             toolbar.AddItem(appDef.CreateWidgetReference(measure.Name));
-            
+
             //2.2 specific stuff
             if (owner.SiteVersion >= new Version(2, 2))
             {
@@ -1018,7 +1024,7 @@
             toolbar.AddItem(appDef.CreateWidgetReference(KnownWidgetNames.ViewOptions));
             toolbar.AddItem(appDef.CreateWidgetReference(KnownWidgetNames.About));
             toolbar.AddItem(appDef.CreateWidgetReference(KnownWidgetNames.Help));
-            
+
             //Init secondary toolbar
             secToolbar.AddItem(appDef.CreateWidgetReference(KnownWidgetNames.Select));
             secToolbar.AddItem(appDef.CreateWidgetReference(KnownWidgetNames.Pan));
@@ -1348,8 +1354,8 @@
         /// <returns></returns>Properties.Resources.
         public static IAttributeRelation CreateAttributeRelation()
         {
-            IAttributeRelation rel = new OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0.AttributeRelateType() 
-            { 
+            IAttributeRelation rel = new OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0.AttributeRelateType()
+            {
                 RelateProperty = new System.ComponentModel.BindingList<OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0.RelatePropertyType>(),
             };
             rel.RelateType = RelateTypeEnum.LeftOuter;
@@ -1380,4 +1386,4 @@
             return new Point3DImpl() { X = x, Y = y, Z = z };
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/PrintLayout.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/PrintLayout.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/PrintLayout.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels.PrintLayout;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.Xml.Serialization;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.PrintLayout;
 
 #pragma warning disable 1591, 0114, 0108
 
@@ -31,7 +33,9 @@
 {
     partial class PrintLayout : IPrintLayout
     {
-        internal PrintLayout() { }
+        internal PrintLayout()
+        {
+        }
 
         private static readonly Version RES_VERSION = new Version(1, 0, 0);
 
@@ -89,7 +93,7 @@
         }
 
         [XmlAttribute("noNamespaceSchemaLocation", Namespace = "http://www.w3.org/2001/XMLSchema-instance")] //NOXLATE
-        public string ValidatingSchema 
+        public string ValidatingSchema
         {
             get { return "PrintLayout-1.0.0.xsd"; } //NOXLATE
             set { }
@@ -116,7 +120,7 @@
         [XmlIgnore]
         IEnumerable<ILogo> IPrintLayout.CustomLogos
         {
-            get 
+            get
             {
                 foreach (var logo in this.CustomLogos)
                 {
@@ -138,7 +142,7 @@
         [XmlIgnore]
         IEnumerable<IText> IPrintLayout.CustomText
         {
-            get 
+            get
             {
                 foreach (var text in this.CustomText)
                 {
@@ -251,7 +255,6 @@
 
     partial class PrintLayoutLayoutProperties : IPrintLayoutProperties
     {
-
     }
 
     partial class PrintLayoutLogo : ILogo
@@ -292,12 +295,10 @@
 
     partial class PrintLayoutLogoPosition : IPosition
     {
-
     }
 
     partial class PrintLayoutLogoSize : ISize
     {
-
     }
 
     partial class PrintLayoutText : IText
@@ -317,11 +318,9 @@
 
     partial class PrintLayoutTextFont : IFont
     {
-
     }
 
     partial class PrintLayoutTextPosition : IPosition
-    { 
-    
+    {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/PrintLayoutInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/PrintLayoutInterfaces.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/PrintLayoutInterfaces.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
+using System.ComponentModel;
 using System.Drawing;
-using System.ComponentModel;
 
 namespace OSGeo.MapGuide.ObjectModels.PrintLayout
 {
@@ -36,6 +37,7 @@
         /// </summary>
         /// <value>The page properties.</value>
         IPrintLayoutPageProperties PageProperties { get; }
+
         /// <summary>
         /// Gets the layout properties.
         /// </summary>
@@ -50,6 +52,7 @@
         /// <param name="units">The units.</param>
         /// <returns></returns>
         ISize CreateLogoSize(float width, float height, string units);
+
         /// <summary>
         /// Creates the font.
         /// </summary>
@@ -58,6 +61,7 @@
         /// <param name="units">The units.</param>
         /// <returns></returns>
         IFont CreateFont(string name, float height, string units);
+
         /// <summary>
         /// Creates the logo position.
         /// </summary>
@@ -66,6 +70,7 @@
         /// <param name="units">The units.</param>
         /// <returns></returns>
         IPosition CreateLogoPosition(float left, float bottom, string units);
+
         /// <summary>
         /// Creates the text position.
         /// </summary>
@@ -80,6 +85,7 @@
         /// </summary>
         /// <value>The custom logos.</value>
         IEnumerable<ILogo> CustomLogos { get; }
+
         /// <summary>
         /// Creates the logo.
         /// </summary>
@@ -89,11 +95,13 @@
         /// <param name="position">The position.</param>
         /// <returns></returns>
         ILogo CreateLogo(string symbolLibraryId, string symbolName, ISize size, IPosition position);
+
         /// <summary>
         /// Adds the logo.
         /// </summary>
         /// <param name="logo">The logo.</param>
         void AddLogo(ILogo logo);
+
         /// <summary>
         /// Removes the logo.
         /// </summary>
@@ -105,6 +113,7 @@
         /// </summary>
         /// <value>The custom text elements.</value>
         IEnumerable<IText> CustomText { get; }
+
         /// <summary>
         /// Creates the text element.
         /// </summary>
@@ -113,11 +122,13 @@
         /// <param name="text">The text.</param>
         /// <returns></returns>
         IText CreateText(string value, IFont font, IPosition text);
+
         /// <summary>
         /// Adds the text.
         /// </summary>
         /// <param name="text">The text.</param>
         void AddText(IText text);
+
         /// <summary>
         /// Removes the text.
         /// </summary>
@@ -201,11 +212,13 @@
         /// </summary>
         /// <value>The left margin.</value>
         float Left { get; set; }
+
         /// <summary>
         /// Gets or sets the bottom margin.
         /// </summary>
         /// <value>The bottom margin.</value>
         float Bottom { get; set; }
+
         /// <summary>
         /// Gets or sets the units.
         /// </summary>
@@ -223,11 +236,13 @@
         /// </summary>
         /// <value>The width.</value>
         float Width { get; set; }
+
         /// <summary>
         /// Gets or sets the height.
         /// </summary>
         /// <value>The height.</value>
         float Height { get; set; }
+
         /// <summary>
         /// Gets or sets the units.
         /// </summary>
@@ -245,21 +260,25 @@
         /// </summary>
         /// <value>The position.</value>
         IPosition Position { get; }
+
         /// <summary>
         /// Gets or sets the resource id.
         /// </summary>
         /// <value>The resource id.</value>
         string ResourceId { get; set; }
+
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
         string Name { get; set; }
+
         /// <summary>
         /// Gets the size.
         /// </summary>
         /// <value>The size.</value>
         ISize Size { get; }
+
         /// <summary>
         /// Gets or sets the rotation.
         /// </summary>
@@ -314,4 +333,4 @@
         /// <value>The value.</value>
         string Value { get; set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ResourceItems.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ResourceItems.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ResourceItems.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.Xml.Serialization;
-using OSGeo.MapGuide.MaestroAPI;
 
 #pragma warning disable 1591, 0114, 0108
 
@@ -43,7 +44,7 @@
         }
     }
 
-    partial class ResourceListResourceDocument : IRepositoryItem 
+    partial class ResourceListResourceDocument : IRepositoryItem
     {
         [XmlIgnore]
         public string Name
@@ -66,7 +67,7 @@
         [XmlIgnore]
         public string Name
         {
-            get 
+            get
             {
                 if (this.ResourceId != "Library://")
                     return ResourceIdentifier.GetName(this.ResourceId);
@@ -84,4 +85,4 @@
         [XmlIgnore]
         public bool IsFolder { get { return true; } }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ResourceList.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ResourceList.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ResourceList.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Collections.Specialized;
 using System.Xml.Serialization;
 
@@ -29,12 +29,16 @@
 {
     partial class ResourceSecurityTypeGroups
     {
-        internal ResourceSecurityTypeGroups() { }
+        internal ResourceSecurityTypeGroups()
+        {
+        }
     }
 
     partial class ResourceSecurityTypeUsers
     {
-        internal ResourceSecurityTypeUsers() { }
+        internal ResourceSecurityTypeUsers()
+        {
+        }
     }
 
     partial class ResourceDocumentHeaderType
@@ -51,12 +55,14 @@
         /// For internal use only. Made public to satisfy serialization requirements. Use <see cref="M:OSGeo.MapGuide.ObjectModels.ResourceDocumentHeaderType.CreateDefault"/> to
         /// create new instances
         /// </summary>
-        public ResourceDocumentHeaderType() { }
+        public ResourceDocumentHeaderType()
+        {
+        }
 
         //Required for saving/updating
 
         [XmlAttribute("noNamespaceSchemaLocation", Namespace = "http://www.w3.org/2001/XMLSchema-instance")] //NOXLATE
-        public string ValidatingSchema 
+        public string ValidatingSchema
         {
             get { return "ResourceDocumentHeader-1.0.0.xsd"; } //NOXLATE
             set { }
@@ -77,7 +83,9 @@
         /// For internal use only. Made public to satisfy serialization requirements. Use <see cref="M:OSGeo.MapGuide.ObjectModels.ResourceDocumentHeaderType.CreateDefault"/> to
         /// create new instances
         /// </summary>
-        public ResourceFolderHeaderType() { }
+        public ResourceFolderHeaderType()
+        {
+        }
 
         //Required for saving/updating
 
@@ -91,13 +99,17 @@
 
     partial class ResourceDocumentHeaderTypeMetadataSimple
     {
-        internal ResourceDocumentHeaderTypeMetadataSimple() { }
+        internal ResourceDocumentHeaderTypeMetadataSimple()
+        {
+        }
     }
 
     partial class ResourceDocumentHeaderTypeMetadata
     {
-        internal ResourceDocumentHeaderTypeMetadata() { }
-        
+        internal ResourceDocumentHeaderTypeMetadata()
+        {
+        }
+
         /// <summary>
         /// Returns a <see cref="NameValueCollection"/> of all the metadata properties
         /// </summary>
@@ -158,4 +170,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ResourcePackageManifest.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ResourcePackageManifest.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ResourcePackageManifest.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OSGeo.MapGuide.ObjectModels.Common
+namespace OSGeo.MapGuide.ObjectModels.Common
 {
     partial class ResourcePackageManifestOperationsOperationParameters
     {
@@ -52,4 +48,4 @@
             });
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/RuntimeMapImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/RuntimeMapImpl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/RuntimeMapImpl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.Common;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.RuntimeMap
 {
@@ -49,7 +51,7 @@
 
         int IRuntimeMapInfo.DisplayDpi
         {
-            get 
+            get
             {
                 int dpi;
                 if (int.TryParse(this.DisplayDpi, out dpi))
@@ -70,7 +72,7 @@
 
         IEnvelope IRuntimeMapInfo.Extents
         {
-            get 
+            get
             {
                 double minx;
                 double miny;
@@ -87,7 +89,7 @@
             }
         }
 
-        ReadOnlyLayerCollection _roLayers;
+        private ReadOnlyLayerCollection _roLayers;
 
         IRuntimeLayerInfoCollection IRuntimeMapInfo.Layers
         {
@@ -103,11 +105,11 @@
             }
         }
 
-        ReadOnlyGroupCollection _roGroups;
+        private ReadOnlyGroupCollection _roGroups;
 
         IRuntimeLayerGroupInfoCollection IRuntimeMapInfo.Groups
         {
-            get 
+            get
             {
                 if (this.Group == null)
                     return null;
@@ -129,7 +131,7 @@
     }
 
     //I love C# generics!
-    internal abstract class ReadOnlyCollectionWrapper<TInterface, TImpl> 
+    internal abstract class ReadOnlyCollectionWrapper<TInterface, TImpl>
         : IReadOnlyCollection<TInterface>
         where TImpl : TInterface
     {
@@ -150,7 +152,7 @@
             get { return _list[index]; }
         }
 
-        class Enumerator : IEnumerator<TInterface>
+        private class Enumerator : IEnumerator<TInterface>
         {
             private IList<TImpl> _innerList;
             private int _pos;
@@ -168,7 +170,6 @@
 
             public void Dispose()
             {
-                
             }
 
             object System.Collections.IEnumerator.Current
@@ -201,7 +202,6 @@
 
     partial class RuntimeMapLayer : IRuntimeLayerInfo
     {
-
         int IRuntimeLayerInfo.LayerType
         {
             get { return Convert.ToInt32(this.Type); }
@@ -212,7 +212,7 @@
             get { return this.FeatureSource; }
         }
 
-        ScaleRangeCollection _roScales;
+        private ScaleRangeCollection _roScales;
 
         IScaleRangeInfoCollection IRuntimeLayerInfo.ScaleRanges
         {
@@ -268,40 +268,55 @@
     internal class ReadOnlyLayerCollection : ReadOnlyCollectionWrapper<IRuntimeLayerInfo, RuntimeMapLayer>,
                                              IRuntimeLayerInfoCollection
     {
-        public ReadOnlyLayerCollection(IList<RuntimeMapLayer> list) : base(list) { }
+        public ReadOnlyLayerCollection(IList<RuntimeMapLayer> list)
+            : base(list)
+        {
+        }
     }
 
     internal class ReadOnlyGroupCollection : ReadOnlyCollectionWrapper<IRuntimeLayerGroupInfo, RuntimeMapGroup>,
                                              IRuntimeLayerGroupInfoCollection
     {
-        public ReadOnlyGroupCollection(IList<RuntimeMapGroup> list) : base(list) { }
+        public ReadOnlyGroupCollection(IList<RuntimeMapGroup> list)
+            : base(list)
+        {
+        }
     }
 
     internal class ScaleRangeCollection : ReadOnlyCollectionWrapper<IScaleRangeInfo, ScaleRangeInfo>,
                                           IScaleRangeInfoCollection
     {
-        public ScaleRangeCollection(IList<ScaleRangeInfo> list) : base(list) { }
+        public ScaleRangeCollection(IList<ScaleRangeInfo> list)
+            : base(list)
+        {
+        }
     }
 
     internal class FeatureStyleCollection : ReadOnlyCollectionWrapper<IFeatureStyleInfo, FeatureStyleInfo>,
                                             IFeatureStyleInfoCollection
     {
-        public FeatureStyleCollection(IList<FeatureStyleInfo> list) : base(list) { }
+        public FeatureStyleCollection(IList<FeatureStyleInfo> list)
+            : base(list)
+        {
+        }
     }
 
     internal class RuleInfoCollection : ReadOnlyCollectionWrapper<IRuleInfo, RuleInfo>,
                                         IRuleInfoCollection
     {
-        public RuleInfoCollection(IList<RuleInfo> list) : base(list) { }
+        public RuleInfoCollection(IList<RuleInfo> list)
+            : base(list)
+        {
+        }
     }
 
     partial class ScaleRangeInfo : IScaleRangeInfo
     {
-        FeatureStyleCollection _roStyles;
+        private FeatureStyleCollection _roStyles;
 
         IFeatureStyleInfoCollection IScaleRangeInfo.FeatureStyle
         {
-            get 
+            get
             {
                 if (this.FeatureStyle == null)
                     return null;
@@ -321,14 +336,14 @@
             get { return Convert.ToInt32(this.Type); }
         }
 
-        RuleInfoCollection _roRules;
+        private RuleInfoCollection _roRules;
 
         /// <summary>
         /// Gets the rules in this feature style
         /// </summary>
         public IRuleInfoCollection Rules
         {
-            get 
+            get
             {
                 if (this.Rule == null)
                     return null;
@@ -351,6 +366,5 @@
 
     partial class CoordinateSystemType : ICoordinateSystemInfo
     {
-
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/RuntimeMapInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/RuntimeMapInterfaces.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/RuntimeMapInterfaces.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.Common;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.RuntimeMap
 {
@@ -60,7 +60,7 @@
         /// Gets the mime type of any inline icons.
         /// </summary>
         /// <remarks>
-        /// If the application did not request any icons as part of the CreateRuntimeMap 
+        /// If the application did not request any icons as part of the CreateRuntimeMap
         /// or DescribeRuntimeMap request, this property is null
         /// </remarks>
         string IconMimeType { get; }
@@ -126,7 +126,7 @@
         /// </summary>
         double MetersPerUnit { get; }
     }
-    
+
     /// <summary>
     /// Models a legend element
     /// </summary>
@@ -316,7 +316,6 @@
     /// </summary>
     public interface IRuntimeLayerInfoCollection : IReadOnlyCollection<IRuntimeLayerInfo>
     {
-
     }
 
     /// <summary>
@@ -324,7 +323,6 @@
     /// </summary>
     public interface IRuntimeLayerGroupInfoCollection : IReadOnlyCollection<IRuntimeLayerGroupInfo>
     {
-
     }
 
     /// <summary>
@@ -332,7 +330,6 @@
     /// </summary>
     public interface IScaleRangeInfoCollection : IReadOnlyCollection<IScaleRangeInfo>
     {
-
     }
 
     /// <summary>
@@ -340,7 +337,6 @@
     /// </summary>
     public interface IFeatureStyleInfoCollection : IReadOnlyCollection<IFeatureStyleInfo>
     {
-
     }
 
     /// <summary>
@@ -348,6 +344,5 @@
     /// </summary>
     public interface IRuleInfoCollection : IReadOnlyCollection<IRuleInfo>
     {
-
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefFactory.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefFactory.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefFactory.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,37 +1,38 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
 #pragma warning disable 1591, 0114, 0108, 0114, 0108
-using System;
-using System.Collections.Generic;
-using System.Text;
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.IO;
 using System.Xml;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
 
 #if SYM_DEF_240
 namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition_2_4_0
 #elif SYM_DEF_110
 namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0
 #else
+
 namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0
 #endif
 {
@@ -70,4 +71,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefinition.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefinition.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels.Common;
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using System.Xml.Serialization;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System.Globalization;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
 using System.Xml;
-using System.IO;
-using OSGeo.MapGuide.ObjectModels.Common;
+using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108
 
@@ -37,6 +37,7 @@
 #elif SYM_DEF_110
 namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0
 #else
+
 namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0
 #endif
 {
@@ -165,7 +166,7 @@
         [XmlIgnore]
         IEnumerable<IGraphicBase> ISimpleSymbolDefinition.Graphics
         {
-            get 
+            get
             {
                 foreach (var g in this.Graphics)
                 {
@@ -255,7 +256,6 @@
             get { return parameterDefinitionField; }
         }
 
-
         public IImageReference CreateImageReference(string resourceId, string dataName)
         {
             return new ImageReference()
@@ -290,7 +290,6 @@
                 /*
                 DefaultPath = new Path()
                 {
-                    
                 },*/
                 //EndOffset = "0", //NOXLATE
                 //Repeat = "0", //NOXLATE
@@ -331,7 +330,6 @@
             };
         }
 
-
         public ITextFrame CreateFrame()
         {
             return new TextFrame() { };
@@ -351,15 +349,15 @@
         public IImageGraphic CreateImageGraphics()
         {
             //default to empty inline content
-            return new Image() 
-            { 
+            return new Image()
+            {
                 Item = new byte[0]
             };
         }
 
         public IParameter CreateParameter()
         {
-            return new Parameter() 
+            return new Parameter()
             {
                 Identifier = "", //NOXLATE
                 DefaultValue = "", //NOXLATE
@@ -392,6 +390,7 @@
 #if SYM_DEF_240 || SYM_DEF_110
     partial class Text : ITextGraphic2
 #else
+
     partial class Text : ITextGraphic
 #endif
     {
@@ -465,7 +464,7 @@
         [XmlIgnore]
         public IEnumerable<IGraphicBase> Elements
         {
-            get 
+            get
             {
                 foreach (var g in this.Items)
                 {
@@ -537,103 +536,137 @@
             {
                 case DataType2.Angle:
                     return ExpressionDataType.Sym_Angle;
+
                 case DataType2.Bold:
                     return ExpressionDataType.Sym_Bold;
+
                 case DataType2.Boolean:
                     return ExpressionDataType.Sym_Boolean;
+
                 case DataType2.Color:
                     return ExpressionDataType.Sym_Color;
+
                 case DataType2.Content:
-                    return ExpressionDataType.Sym_Content; 
+                    return ExpressionDataType.Sym_Content;
+
                 case DataType2.EndOffset:
                     return ExpressionDataType.Sym_EndOffset;
+
                 case DataType2.FillColor:
                     return ExpressionDataType.Sym_FillColor;
+
                 case DataType2.FontHeight:
                     return ExpressionDataType.Sym_FontHeight;
+
                 case DataType2.FontName:
                     return ExpressionDataType.Sym_FontName;
+
                 case DataType2.FrameFillColor:
                     return ExpressionDataType.Sym_FrameFillColor;
+
                 case DataType2.FrameLineColor:
                     return ExpressionDataType.Sym_FrameLineColor;
+
                 case DataType2.GhostColor:
                     return ExpressionDataType.Sym_GhostColor;
+
                 case DataType2.HorizontalAlignment:
                     return ExpressionDataType.Sym_HorizontalAlignment;
+
                 case DataType2.Integer:
                     return ExpressionDataType.Sym_Integer;
+
                 case DataType2.Italic:
                     return ExpressionDataType.Sym_Italic;
+
                 case DataType2.Justification:
                     return ExpressionDataType.Sym_Justification;
+
                 case DataType2.LineColor:
                     return ExpressionDataType.Sym_LineColor;
+
                 case DataType2.LineSpacing:
                     return ExpressionDataType.Sym_LineSpacing;
+
                 case DataType2.LineWeight:
                     return ExpressionDataType.Sym_LineWeight;
+
                 case DataType2.Markup:
                     return ExpressionDataType.Sym_Markup;
+
                 case DataType2.ObliqueAngle:
                     return ExpressionDataType.Sym_ObliqueAngle;
+
                 case DataType2.Overlined:
                     return ExpressionDataType.Sym_Overlined;
+
                 case DataType2.Real:
                     return ExpressionDataType.Sym_Real;
+
                 case DataType2.RepeatX:
                     return ExpressionDataType.Sym_RepeatX;
+
                 case DataType2.RepeatY:
                     return ExpressionDataType.Sym_RepeatY;
+
                 case DataType2.StartOffset:
                     return ExpressionDataType.Sym_StartOffset;
+
                 case DataType2.String:
                     return ExpressionDataType.Sym_String;
+
                 case DataType2 .TextColor:
                     return ExpressionDataType.Sym_TextColor;
+
                 case DataType2.TrackSpacing:
                     return ExpressionDataType.Sym_TrackSpacing;
+
                 case DataType2.Underlined:
                     return ExpressionDataType.Sym_Underlined;
+
                 case DataType2.VerticalAlignment:
                     return ExpressionDataType.Sym_VerticalAlignment;
             }
             throw new ArgumentException();
         }
 #else
-        static ExpressionDataType GetExpressionType(DataType dt)
+
+        private static ExpressionDataType GetExpressionType(DataType dt)
         {
             switch (dt)
             {
                 case DataType.Boolean:
                     return ExpressionDataType.Sym_Boolean;
+
                 case DataType.Color:
                     return ExpressionDataType.Sym_Color;
+
                 case DataType.Integer:
                     return ExpressionDataType.Sym_Integer;
+
                 case DataType.Real:
                     return ExpressionDataType.Sym_Real;
+
                 case DataType.String:
                     return ExpressionDataType.Sym_String;
             }
             throw new ArgumentException();
         }
+
 #endif
 
-
         ExpressionDataType IExpressionPropertySource.ExpressionType
         {
             get { return GetExpressionType(this.DataType); }
         }
     }
- 
 
     partial class ParameterDefinition : IParameterDefinition
     {
         [XmlIgnore]
         IEnumerable<IParameter> IParameterDefinition.Parameter
         {
-            get 
+            get
             {
                 foreach (var p in this.Parameter)
                 {
@@ -679,12 +712,10 @@
 
     partial class PointUsage : IPointUsage
     {
-        
     }
 
     partial class AreaUsage : IAreaUsage
     {
-        
     }
 
     partial class Path : IPathGraphic
@@ -734,7 +765,7 @@
         [XmlIgnore]
         IEnumerable<ISimpleSymbolReferenceBase> ICompoundSymbolDefinition.SimpleSymbol
         {
-            get 
+            get
             {
                 foreach (var sym in this.SimpleSymbol)
                 {
@@ -810,7 +841,7 @@
         [XmlIgnore]
         public SimpleSymbolReferenceType Type
         {
-            get 
+            get
             {
                 if (this.Item != null)
                 {
@@ -885,7 +916,7 @@
             }
         }
     }
- 
+
     partial class ImageReference : ISymbolInstanceReferenceLibrary, IImageReference
     {
         [XmlIgnore]
@@ -899,4 +930,4 @@
             get { return ImageType.Reference; }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolInterfaces.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolInterfaces.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels.Common;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition
 {
@@ -37,6 +38,7 @@
         /// A library reference to an existing symbol definition
         /// </summary>
         Reference,
+
         /// <summary>
         /// An inline symbol definition
         /// </summary>
@@ -130,7 +132,7 @@
         /// <summary>
         /// Gets or sets the inline definition
         /// </summary>
-        ISymbolDefinitionBase SymbolDefinition { get; set; } 
+        ISymbolDefinitionBase SymbolDefinition { get; set; }
     }
 
     /// <summary>
@@ -200,7 +202,7 @@
                     {
                         p.AddRange(((ISimpleSymbolDefinition)symDef).GetParameters());
                     }
-                    else 
+                    else
                     {
                         p.AddRange(((ICompoundSymbolDefinition)symDef).GetParameters());
                     }
@@ -221,6 +223,7 @@
         /// A simple symbol definition
         /// </summary>
         Simple,
+
         /// <summary>
         /// A compound symbol definition
         /// </summary>
@@ -634,7 +637,6 @@
     [System.SerializableAttribute()]
     public enum DataType
     {
-
         /// <remarks/>
         String,
 
@@ -759,10 +761,12 @@
         /// External resource id reference
         /// </summary>
         Library,
+
         /// <summary>
         /// Inlined definition
         /// </summary>
         Inline,
+
         /// <summary>
         /// Undefined
         /// </summary>
@@ -778,10 +782,12 @@
         /// Text
         /// </summary>
         Text,
+
         /// <summary>
         /// Images
         /// </summary>
         Image,
+
         /// <summary>
         /// A linear path containing one or more segments
         /// </summary>
@@ -886,6 +892,7 @@
         /// A reference to an image
         /// </summary>
         Reference,
+
         /// <summary>
         /// Inline content
         /// </summary>
@@ -906,7 +913,7 @@
         /// <code>
         /// IInlineImage img1 = (IInlineImage)imageGraphic.Item;
         /// IInlineImage img2 = (IInlineImage)imageGraphic.Item;
-        /// 
+        ///
         /// Object.ReferenceEquals(img1, img2);                 //false
         /// Object.ReferenceEquals(img1.Content, img2.Content); //true
         /// </code>
@@ -1130,19 +1137,22 @@
     public enum GrowControl
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         GrowInX,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         GrowInY,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         GrowInXY,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         GrowInXYMaintainAspect,
     }
@@ -1153,11 +1163,12 @@
     public enum AngleControl
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         FromAngle,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         FromGeometry,
     }
@@ -1168,11 +1179,12 @@
     public enum UnitsControl
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Absolute,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Parametric,
     }
@@ -1183,19 +1195,22 @@
     public enum VertexControl
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         OverlapNone,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         OverlapDirect,
+
         /// <summary>
         /// Introduced with Symbol Definition 1.1.0 schema
         /// </summary>
         OverlapNoWrap,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         OverlapWrap,
     }
@@ -1206,19 +1221,22 @@
     public enum VertexJoin
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         None,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Bevel,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Round,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Miter,
     }
@@ -1229,15 +1247,17 @@
     public enum OriginControl
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Global,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Local,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Centroid,
     }
@@ -1248,15 +1268,17 @@
     public enum ClippingControl
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Clip,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Inside,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Overlap
     }
@@ -1267,15 +1289,17 @@
     public enum ResizeControl
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         ResizeNone,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         AddToResizeBox,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         AdjustToResizeBox,
     }
@@ -1286,19 +1310,22 @@
     public enum LineCap
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         None,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Round,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Triangle,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Square,
     }
@@ -1309,19 +1336,22 @@
     public enum LineJoin
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         None,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Bevel,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Round,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Miter,
     }
@@ -1332,15 +1362,17 @@
     public enum HorizontalAlignment
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Left,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Center,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Right,
     }
@@ -1351,23 +1383,27 @@
     public enum VerticalAlignment
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Bottom,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Baseline,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Halfline,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Capline,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Top,
     }
@@ -1378,30 +1414,35 @@
     public enum Justification
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Left,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Center,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Right,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Justified,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         FromAlignment,
     }
 
-    #endregion
+    #endregion Symbol Definition 1.0.0 interfaces
 
     #region Symbol Definition 1.1.0 interfaces
+
     /// <summary>
     /// An extension of the text element to support rich text. Introduced with the Symbol Definition 1.1.0 schema
     /// </summary>
@@ -1434,7 +1475,6 @@
     [System.SerializableAttribute()]
     public enum DataType2
     {
-
         /// <remarks/>
         String,
 
@@ -1528,9 +1568,11 @@
         /// <remarks/>
         RepeatY,
     }
-    #endregion
 
+    #endregion Symbol Definition 1.1.0 interfaces
+
     #region Symbol Definition 2.4.0 interfaces
+
     /// <summary>
     /// Path with support for scaling. Only applicable for Symbol Definition schema
     /// 2.4.0 and higher
@@ -1547,5 +1589,6 @@
         /// </summary>
         string ScaleY { get; set; }
     }
-    #endregion
-}
+
+    #endregion Symbol Definition 2.4.0 interfaces
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolLibrary.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolLibrary.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolLibrary.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels.SymbolLibrary;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.Xml.Serialization;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.SymbolLibrary;
 
 #pragma warning disable 1591, 0114, 0108
 
@@ -31,7 +33,9 @@
 {
     partial class SymbolLibraryType : ISymbolLibrary
     {
-        internal SymbolLibraryType() { }
+        internal SymbolLibraryType()
+        {
+        }
 
         private static readonly Version RES_VERSION = new Version(1, 0, 0);
 
@@ -89,8 +93,8 @@
         }
 
         [XmlAttribute("noNamespaceSchemaLocation", Namespace = "http://www.w3.org/2001/XMLSchema-instance")]
-        public string ValidatingSchema 
-        { 
+        public string ValidatingSchema
+        {
             get { return "SymbolLibrary-1.0.0.xsd"; }
             set { }
         }
@@ -116,4 +120,4 @@
     partial class SymbolType : ISymbol
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolLibraryInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolLibraryInterfaces.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolLibraryInterfaces.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 
 namespace OSGeo.MapGuide.ObjectModels.SymbolLibrary
 {
@@ -59,4 +60,4 @@
         /// <value>The resource.</value>
         string Resource { get; set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/UnmanagedDataList.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/UnmanagedDataList.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/UnmanagedDataList.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Xml.Serialization;
-using System.Diagnostics;
 
 #pragma warning disable 1591, 0114, 0108
 
@@ -80,4 +79,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/UntypedResource.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/UntypedResource.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/UntypedResource.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI;
 
 #pragma warning disable 1591, 0114, 0108
 
@@ -132,4 +133,4 @@
             get { return false; }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,79 +1,81 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
+using System.ComponentModel;
 using System.Xml.Serialization;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.Common;
-using System.ComponentModel;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using System.Globalization;
 
 #pragma warning disable 1591, 0114, 0108
 
 #if LDF_110
 namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_1_0
 #elif LDF_120
+
 namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_2_0
 #elif LDF_130
 namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_3_0
 #elif LDF_230
 namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_2_3_0
 #elif LDF_240
+
 namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_2_4_0
 #else
+
 namespace OSGeo.MapGuide.ObjectModels.LayerDefinition_1_0_0
 #endif
 {
     using OSGeo.MapGuide.ObjectModels.LayerDefinition;
     using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-    using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 
     abstract partial class BaseLayerDefinitionType : ISubLayerDefinition
 #if LDF_230 || LDF_240
-        , ISubLayerDefinition2
+, ISubLayerDefinition2
 #endif
     {
         [XmlIgnore]
         public abstract LayerType LayerType { get; }
 
 #if LDF_230 || LDF_240
+
         [XmlIgnore]
-        IEnumerable<OSGeo.MapGuide.ObjectModels.WatermarkDefinition.IWatermark> IWatermarkCollection.Watermarks
+        IEnumerable<IWatermark> IWatermarkCollection.Watermarks
         {
-            get 
+            get
             {
                 foreach (var wm in this.Watermarks)
                     yield return wm;
             }
         }
 
-        IWatermark IWatermarkCollection.AddWatermark(OSGeo.MapGuide.ObjectModels.WatermarkDefinition.IWatermarkDefinition watermark)
+        IWatermark IWatermarkCollection.AddWatermark(IWatermarkDefinition watermark)
         {
             return WatermarkCollectionUtil.AddWatermark(this.Watermarks, watermark);
         }
 
-        void IWatermarkCollection.RemoveWatermark(OSGeo.MapGuide.ObjectModels.WatermarkDefinition.IWatermark watermark)
+        void IWatermarkCollection.RemoveWatermark(IWatermark watermark)
         {
             WatermarkCollectionUtil.RemoveWatermark(this.Watermarks, watermark);
         }
@@ -83,6 +85,7 @@
         {
             get { return this.Watermarks.Count; }
         }
+
 #endif
     }
 
@@ -117,10 +120,11 @@
 
     partial class VectorScaleRangeType : IVectorScaleRange
 #if !LDF_100
-        , IVectorScaleRange2
+, IVectorScaleRange2
 #endif
     {
         #region Missing generated stuff
+
         [EditorBrowsable(EditorBrowsableState.Never)]
         private bool minScaleFieldSpecified;
 
@@ -140,8 +144,9 @@
                 }
             }
         }
-        #endregion
 
+        #endregion Missing generated stuff
+
         [XmlIgnore]
         public IAreaVectorStyle AreaStyle
         {
@@ -166,7 +171,7 @@
                 //Put the new one in if it is not null
                 if (value != null)
                 {
-                    this.itemsField.Add(value);   
+                    this.itemsField.Add(value);
                 }
             }
         }
@@ -199,7 +204,7 @@
                 }
             }
         }
-        
+
         [XmlIgnore]
         public IPointVectorStyle PointStyle
         {
@@ -283,6 +288,7 @@
         }
 
 #if LDF_110 || LDF_120
+
         [XmlIgnore]
         public IEnumerable<ICompositeTypeStyle> CompositeStyle
         {
@@ -304,7 +310,7 @@
                         remove.Add(item);
                 }
 
-                foreach(var obj in remove)
+                foreach (var obj in remove)
                 {
                     this.itemsField.Remove(obj);
                 }
@@ -322,7 +328,9 @@
                 }
             }
         }
+
 #elif LDF_130 || LDF_230 || LDF_240
+
         [XmlIgnore]
         public IEnumerable<ICompositeTypeStyle> CompositeStyle
         {
@@ -344,7 +352,7 @@
                         remove.Add(item);
                 }
 
-                foreach(var obj in remove)
+                foreach (var obj in remove)
                 {
                     this.itemsField.Remove(obj);
                 }
@@ -362,10 +370,12 @@
                 }
             }
         }
+
 #endif
 
 #if LDF_100
 #else
+
         IElevationSettings IVectorScaleRange2.ElevationSettings
         {
             get { return this.ElevationSettings; }
@@ -397,21 +407,28 @@
                 return count;
             }
         }
+
 #endif
     }
 
 #if LDF_100
 #else
+
     partial class ElevationSettingsType : IElevationSettings { }
+
 #endif
 
 #if LDF_100
+
     partial class StrokeType : IStroke
 #else
+
     partial class StrokeType : IStroke, IStroke2
 #endif
     {
-        internal StrokeType() { }
+        internal StrokeType()
+        {
+        }
 
         IStroke ICloneableLayerElement<IStroke>.Clone()
         {
@@ -420,16 +437,20 @@
 
 #if LDF_100
 #else
+
         IStroke2 ICloneableLayerElement<IStroke2>.Clone()
         {
             return StrokeType.Deserialize(this.Serialize());
         }
+
 #endif
     }
 
     partial class FillType : IFill
     {
-        internal FillType() { }
+        internal FillType()
+        {
+        }
 
         IFill ICloneableLayerElement<IFill>.Clone()
         {
@@ -439,13 +460,13 @@
 
     partial class AreaTypeStyleType : IAreaVectorStyle
 #if LDF_130 || LDF_230 || LDF_240
-        , IAreaVectorStyle2
+, IAreaVectorStyle2
 #endif
     {
         [XmlIgnore]
         IEnumerable<IAreaRule> IAreaVectorStyle.Rules
         {
-            get 
+            get
             {
                 foreach (var ar in this.AreaRule)
                 {
@@ -455,14 +476,14 @@
         }
 
         [XmlIgnore]
-        int IVectorStyle.RuleCount 
-        { 
-            get 
+        int IVectorStyle.RuleCount
+        {
+            get
             {
                 if (this.AreaRule != null)
                     return this.AreaRule.Count;
                 return 0;
-            } 
+            }
         }
 
         void IAreaVectorStyle.RemoveAllRules()
@@ -525,9 +546,10 @@
             return false;
         }
 
-        #endregion
+        #endregion IRuleCollection<IAreaRule> Members
 
         #region IRuleCollection Members
+
         IVectorRule IRuleCollection.GetRuleAt(int index)
         {
             return this.AreaRule[index];
@@ -560,7 +582,8 @@
             }
             return false;
         }
-        #endregion
+
+        #endregion IRuleCollection Members
     }
 
     internal static class CollectionUtil
@@ -629,15 +652,15 @@
 
     partial class PointTypeStyleType : IPointVectorStyle
 #if LDF_130 || LDF_230 || LDF_240
-        , IPointVectorStyle2
+, IPointVectorStyle2
 #endif
     {
         [XmlIgnore]
         public IEnumerable<IPointRule> Rules
         {
-            get 
-            { 
-                foreach(var pr in this.PointRule)
+            get
+            {
+                foreach (var pr in this.PointRule)
                 {
                     yield return pr;
                 }
@@ -711,9 +734,10 @@
             return false;
         }
 
-        #endregion
+        #endregion IRuleCollection<IPointRule> Members
 
         #region IRuleCollection Members
+
         IVectorRule IRuleCollection.GetRuleAt(int index)
         {
             return this.PointRule[index];
@@ -742,10 +766,10 @@
                 return CollectionUtil.MoveDown(this.PointRule, pr);
             return false;
         }
-        #endregion
+
+        #endregion IRuleCollection Members
     }
 
-
     partial class PointRuleType : IPointRule
     {
         [XmlIgnore]
@@ -786,7 +810,7 @@
 
     partial class LineTypeStyleType : ILineVectorStyle
 #if LDF_130 || LDF_230 || LDF_240
-        , ILineVectorStyle2
+, ILineVectorStyle2
 #endif
     {
         [XmlIgnore]
@@ -868,9 +892,10 @@
             return false;
         }
 
-        #endregion
+        #endregion IRuleCollection<ILineRule> Members
 
         #region IRuleCollection Members
+
         IVectorRule IRuleCollection.GetRuleAt(int index)
         {
             return this.LineRule[index];
@@ -899,7 +924,8 @@
                 return CollectionUtil.MoveDown(this.LineRule, lr);
             return false;
         }
-        #endregion
+
+        #endregion IRuleCollection Members
     }
 
     partial class LineRuleType : ILineRule
@@ -1202,7 +1228,6 @@
         }
     }
 
-
     partial class ImageSymbolType : IImageSymbol
     {
         [XmlIgnore]
@@ -1603,7 +1628,6 @@
 
     partial class TextSymbolTypeAdvancedPlacement : IAdvancedPlacement
     {
-        
     }
 
     partial class AreaSymbolizationFillType : IAreaSymbolizationFill
@@ -1642,21 +1666,21 @@
 
     partial class LayerDefinition : ILayerDefinition
     {
-        //internal LayerDefinition() { } 
+        //internal LayerDefinition() { }
 
-        #if LDF_110
+#if LDF_110
         private static readonly Version RES_VERSION = new Version(1, 1, 0);
-        #elif LDF_120
+#elif LDF_120
         private static readonly Version RES_VERSION = new Version(1, 2, 0);
-        #elif LDF_130
+#elif LDF_130
         private static readonly Version RES_VERSION = new Version(1, 3, 0);
-        #elif LDF_230
+#elif LDF_230
         private static readonly Version RES_VERSION = new Version(2, 3, 0);
-        #elif LDF_240
+#elif LDF_240
         private static readonly Version RES_VERSION = new Version(2, 4, 0);
-        #else
+#else
         private static readonly Version RES_VERSION = new Version(1, 0, 0);
-        #endif
+#endif
 
         [XmlIgnore]
         public OSGeo.MapGuide.MaestroAPI.IServerConnection CurrentConnection
@@ -1766,7 +1790,7 @@
 
     partial class VectorLayerDefinitionType : IVectorLayerDefinition
 #if LDF_240
-        , IVectorLayerDefinition2
+, IVectorLayerDefinition2
 #endif
     {
         [XmlIgnore]
@@ -1816,7 +1840,7 @@
                     this.urlDataField.Content = value;
                     OnPropertyChanged("Url"); //NOXLATE
                 }
-                else 
+                else
                 {
                     //NOTE: None of the other URLData properties seem to be used atm
                     //hence why we are nulling this
@@ -1847,7 +1871,7 @@
         [XmlIgnore]
         IEnumerable<IVectorScaleRange> IVectorLayerDefinition.VectorScaleRange
         {
-            get 
+            get
             {
                 foreach (var vsr in this.VectorScaleRange)
                 {
@@ -1995,11 +2019,12 @@
                 return new Version(2, 4, 0);
 #else
                 return null;
-#endif          
+#endif
             }
         }
 
 #if LDF_240
+
         [XmlIgnore]
         IUrlData IVectorLayerDefinition2.UrlData
         {
@@ -2012,6 +2037,7 @@
                 this.UrlData = (URLDataType)value;
             }
         }
+
 #endif
 
         void IVectorLayerDefinition.ClearPropertyMappings()
@@ -2019,7 +2045,9 @@
             propertyMappingField.Clear();
         }
     }
+
     #region Composite Symbolization
+
 #if !LDF_100
 
     partial class CompositeRule : ICompositeRule
@@ -2043,7 +2071,7 @@
         [XmlIgnore]
         IEnumerable<ISymbolInstance> ICompositeSymbolization.SymbolInstance
         {
-            get 
+            get
             {
                 foreach (var sym in this.SymbolInstance)
                 {
@@ -2098,7 +2126,6 @@
             };
         }
 
-
         public ISymbolInstance CreateInlineSimpleSymbol(ISimpleSymbolDefinition symDef)
         {
             return new SymbolInstance()
@@ -2139,7 +2166,7 @@
     partial class SymbolInstance : ISymbolInstance
 #if LDF_100 || LDF_110
 #else
-                                 , ISymbolInstance2
+, ISymbolInstance2
 #endif
     {
         [XmlIgnore]
@@ -2213,8 +2240,8 @@
         public string ResourceId
         {
             get { return _resId; }
-            set 
-            { 
+            set
+            {
                 if (_resId == value) return;
                 _resId = value;
                 OnPropertyChanged("ResourceId"); //NOXLATE
@@ -2258,7 +2285,7 @@
         [XmlIgnore]
         IEnumerable<IParameterOverride> IParameterOverrideCollection.Override
         {
-            get 
+            get
             {
                 foreach (var ov in this.Override)
                 {
@@ -2303,7 +2330,7 @@
         {
             return new Override()
             {
-                ParameterIdentifier = name, 
+                ParameterIdentifier = name,
                 SymbolName = symbol
             };
         }
@@ -2311,12 +2338,11 @@
 
     partial class Override : IParameterOverride
     {
-
     }
 
     partial class CompositeTypeStyle : ICompositeTypeStyle
 #if LDF_130 || LDF_230 || LDF_240
-        , ICompositeTypeStyle2
+, ICompositeTypeStyle2
 #endif
     {
         [XmlIgnore]
@@ -2331,7 +2357,7 @@
         [XmlIgnore]
         IEnumerable<ICompositeRule> ICompositeTypeStyle.CompositeRule
         {
-            get 
+            get
             {
                 foreach (var cr in this.CompositeRule)
                 {
@@ -2397,9 +2423,10 @@
             return false;
         }
 
-        #endregion
+        #endregion IRuleCollection<ICompositeRule> Members
 
         #region IRuleCollection Members
+
         public int IndexOfRule(IVectorRule rule)
         {
             var cr = rule as CompositeRule;
@@ -2428,15 +2455,19 @@
                 return CollectionUtil.MoveDown(this.CompositeRule, cr);
             return false;
         }
-        #endregion
+
+        #endregion IRuleCollection Members
     }
+
 #endif
-    #endregion
 
+    #endregion Composite Symbolization
+
 #if LDF_240
+
     partial class URLDataType : IUrlData
     {
+    }
 
-    }
 #endif
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/WatermarkCollectionUtil.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/WatermarkCollectionUtil.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/WatermarkCollectionUtil.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI;
-using System.IO;
-using System.Xml.Serialization;
 using OSGeo.MapGuide.MaestroAPI.Resource;
+using System.Collections.Generic;
 
 namespace OSGeo.MapGuide.ObjectModels.WatermarkDefinition
 {
@@ -49,4 +47,4 @@
                 collection.Remove(impl);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/WatermarkInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/WatermarkInterfaces.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/WatermarkInterfaces.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.ComponentModel;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-using OSGeo.MapGuide.ObjectModels.Common;
 
 namespace OSGeo.MapGuide.ObjectModels.WatermarkDefinition
 {
@@ -32,37 +33,37 @@
     /// </summary>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.4.0.38968")] //NOXLATE
     [System.SerializableAttribute()]
-    public enum UnitType {
-        
+    public enum UnitType
+    {
         /// <remarks/>
         Inches,
-        
+
         /// <remarks/>
         Centimeters,
-        
+
         /// <remarks/>
         Millimeters,
-        
+
         /// <remarks/>
         Pixels,
-        
+
         /// <remarks/>
         Points,
     }
-    
+
     /// <summary>
     /// The allowed horizontal alignment values for a watermark position
     /// </summary>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.4.0.38968")] //NOXLATE
     [System.SerializableAttribute()]
-    public enum HorizontalAlignmentType {
-        
+    public enum HorizontalAlignmentType
+    {
         /// <remarks/>
         Left,
-        
+
         /// <remarks/>
         Center,
-        
+
         /// <remarks/>
         Right,
     }
@@ -72,35 +73,35 @@
     /// </summary>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.4.0.38968")] //NOXLATE
     [System.SerializableAttribute()]
-    public enum UsageType {
-        
+    public enum UsageType
+    {
         /// <remarks/>
         WMS,
-        
+
         /// <remarks/>
         Viewer,
-        
+
         /// <remarks/>
         All,
     }
-    
+
     /// <summary>
     /// The allowed vertical alignments for a watermark position
     /// </summary>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.4.0.38968")] //NOXLATE
     [System.SerializableAttribute()]
-    public enum VerticalAlignmentType {
-        
+    public enum VerticalAlignmentType
+    {
         /// <remarks/>
         Top,
-        
+
         /// <remarks/>
         Center,
-        
+
         /// <remarks/>
         Bottom,
     }
-    
+
     /// <summary>
     /// A watermark definition containing content, appearance and position information
     /// </summary>
@@ -169,6 +170,7 @@
         /// X/Y based position
         /// </summary>
         XY,
+
         /// <summary>
         /// Tile-based position
         /// </summary>
@@ -347,4 +349,4 @@
         /// <returns></returns>
         ITilePosition CreateDefaultTilePosition();
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/WebLayout.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/WebLayout.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/WebLayout.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using System.Xml.Serialization;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels.WebLayout;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
+using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108
 
@@ -36,6 +38,7 @@
 #elif WL110
 namespace OSGeo.MapGuide.ObjectModels.WebLayout_1_1_0
 #else
+
 namespace OSGeo.MapGuide.ObjectModels.WebLayout_1_0_0
 #endif
 {
@@ -85,7 +88,9 @@
 
     partial class WebLayoutType : IWebLayout, ICommandSet
     {
-        internal WebLayoutType() { }
+        internal WebLayoutType()
+        {
+        }
 
 #if WL260
         private static readonly Version RES_VERSION = new Version(2, 6, 0);
@@ -287,6 +292,7 @@
             wl.CreateCommandItem(BuiltInCommandType.Pan.ToString())
             );
         }
+
         private static void CreateDefaultContextMenu(IWebLayout wl)
         {
             wl.ContextMenu.AddItems(
@@ -802,7 +808,7 @@
             return flyout;
         }
 
-        public ICommandItem CreateCommandItem(string cmdName) 
+        public ICommandItem CreateCommandItem(string cmdName)
         {
             return new CommandItemType() { Function = UIItemFunctionType.Command, Command = cmdName };
         }
@@ -855,7 +861,7 @@
                     }
 
                     this.commandSetField.Add(importCmd);
-                    
+
                     clashes.Add(new ImportedCommandResult() { OriginalName = oldName, ImportedName = newName });
                 }
             }
@@ -869,7 +875,6 @@
             get { return this; }
         }
 
-
         void ICommandSet.Clear()
         {
             this.CommandSet.Clear();
@@ -1015,7 +1020,6 @@
 
     partial class MapViewType : IMapView
     {
-
     }
 
     partial class ToolBarType : IToolbar
@@ -1029,7 +1033,7 @@
         [XmlIgnore]
         public IEnumerable<IUIItem> Items
         {
-            get 
+            get
             {
                 foreach (var item in this.Button)
                 {
@@ -1060,7 +1064,6 @@
             }
         }
 
-
         public bool MoveUp(IUIItem item)
         {
             var it = item as UIItemType;
@@ -1129,7 +1132,6 @@
 
     partial class InformationPaneType : IInformationPane
     {
-
     }
 
     partial class ContextMenuType : IContextMenu
@@ -1372,7 +1374,6 @@
 
     partial class TaskButtonType : ITaskButton
     {
-        
     }
 
     partial class StatusBarType : IStatusBar
@@ -1401,7 +1402,7 @@
         [XmlIgnore]
         IEnumerable<IResourceReference> IPrintCommand.PrintLayout
         {
-            get 
+            get
             {
                 foreach (var refer in this.PrintLayout)
                 {
@@ -1459,7 +1460,7 @@
         [XmlIgnore]
         public IEnumerable<IUIItem> Items
         {
-            get 
+            get
             {
                 foreach (var item in this.SubItem)
                 {
@@ -1567,7 +1568,6 @@
 
     partial class CommandItemType : ICommandItem
     {
-        
     }
 
     partial class InvokeURLCommandType : IInvokeUrlCommand, ILayerSet
@@ -1584,7 +1584,7 @@
         [XmlIgnore]
         IEnumerable<IParameterPair> IInvokeUrlCommand.AdditionalParameter
         {
-            get 
+            get
             {
                 foreach (var pair in this.AdditionalParameter)
                 {
@@ -1621,7 +1621,7 @@
         [XmlIgnore]
         public BindingList<string> Layer
         {
-            get 
+            get
             {
                 return this.LayerSet;
             }
@@ -1642,7 +1642,7 @@
         [XmlIgnore]
         IResultColumnSet ISearchCommand.ResultColumns
         {
-            get 
+            get
             {
                 return this;
             }
@@ -1707,11 +1707,9 @@
 
     partial class ResultColumnType : IResultColumn
     {
-
     }
 
     partial class InvokeScriptCommandType : IInvokeScriptCommand
     {
-        
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/WebLayoutInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/WebLayoutInterfaces.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/WebLayoutInterfaces.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,9 +1,7 @@
-using System;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.ComponentModel;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace OSGeo.MapGuide.ObjectModels.WebLayout
 {
@@ -16,10 +14,12 @@
         /// The context menu
         /// </summary>
         ContextMenu,
+
         /// <summary>
         /// The toolbar
         /// </summary>
         Toolbar,
+
         /// <summary>
         /// The task bar
         /// </summary>
@@ -32,121 +32,148 @@
     public enum BuiltInCommandType : int
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Pan = BasicCommandActionType.Pan,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         PanUp = BasicCommandActionType.PanUp,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         PanDown = BasicCommandActionType.PanDown,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         PanRight = BasicCommandActionType.PanRight,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         PanLeft = BasicCommandActionType.PanLeft,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Zoom = BasicCommandActionType.Zoom,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         ZoomIn = BasicCommandActionType.ZoomIn,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         ZoomOut = BasicCommandActionType.ZoomOut,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         ZoomRectangle = BasicCommandActionType.ZoomRectangle,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         ZoomToSelection = BasicCommandActionType.ZoomToSelection,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         FitToWindow = BasicCommandActionType.FitToWindow,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         PreviousView = BasicCommandActionType.PreviousView,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         NextView = BasicCommandActionType.NextView,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         RestoreView = BasicCommandActionType.RestoreView,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Select = BasicCommandActionType.Select,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         SelectRadius = BasicCommandActionType.SelectRadius,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         SelectPolygon = BasicCommandActionType.SelectPolygon,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         ClearSelection = BasicCommandActionType.ClearSelection,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Refresh = BasicCommandActionType.Refresh,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         CopyMap = BasicCommandActionType.CopyMap,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         About = BasicCommandActionType.About,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Buffer,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         SelectWithin,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Print,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         GetPrintablePage,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Measure,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         ViewOptions,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Help,
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     [System.SerializableAttribute()]
     public enum BasicCommandActionType
@@ -219,12 +246,11 @@
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     [System.SerializableAttribute()]
     public enum UIItemFunctionType
     {
-
         /// <remarks/>
         Separator,
 
@@ -236,12 +262,11 @@
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     [System.SerializableAttribute()]
     public enum TargetType
     {
-
         /// <remarks/>
         TaskPane,
 
@@ -253,12 +278,11 @@
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     [System.SerializableAttribute()]
     public enum TargetViewerType
     {
-
         /// <remarks/>
         Dwf,
 
@@ -679,7 +703,7 @@
     /// <summary>
     /// A flyout menu item
     /// </summary>
-    public interface IFlyoutItem : IUIItem, IMenu, ILocalizable 
+    public interface IFlyoutItem : IUIItem, IMenu, ILocalizable
     {
         /// <summary>
         /// Gets or sets the label.
@@ -766,13 +790,12 @@
             }
         }
     }
-    
+
     /// <summary>
     /// The viewer toolbar
     /// </summary>
     public interface IToolbar : IMenu, IWebLayoutControl, INotifyPropertyChanged
-    { 
-        
+    {
     }
 
     /// <summary>
@@ -858,7 +881,6 @@
     /// </summary>
     public interface ITaskButton : ILocalizable
     {
-
     }
 
     /// <summary>
@@ -876,7 +898,7 @@
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     public delegate void CommandEventHandler(ICommand cmd);
 
@@ -966,7 +988,6 @@
     /// </summary>
     public interface ICustomCommand : ICommand
     {
-
     }
 
     /// <summary>
@@ -1185,7 +1206,7 @@
     /// <summary>
     /// Print command
     /// </summary>
-    public interface IPrintCommand : ICustomCommand 
+    public interface IPrintCommand : ICustomCommand
     {
         /// <summary>
         /// Clears this instance.
@@ -1256,4 +1277,4 @@
         /// <value>The script.</value>
         string Script { get; set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Platform.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Platform.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Platform.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI
 {
@@ -47,4 +48,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/PlatformConnectionBase.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,48 +1,49 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Xml;
-using System.Text;
-using System.IO;
+//
 
-using ObjCommon = OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels.Capabilities;
-using OSGeo.MapGuide.MaestroAPI.Resource;
+#endregion Disclaimer / License
+
+using GeoAPI.Geometries;
 using OSGeo.MapGuide.MaestroAPI.Commands;
+using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
+using OSGeo.MapGuide.MaestroAPI.Feature;
 using OSGeo.MapGuide.MaestroAPI.Mapping;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
 using OSGeo.MapGuide.MaestroAPI.Serialization;
-using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
+using OSGeo.MapGuide.ObjectModels.Capabilities;
+using OSGeo.MapGuide.ObjectModels.Common;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using OSGeo.MapGuide.ObjectModels.LoadProcedure;
 using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.ObjectModels.Common;
+using System;
+using System.Collections;
+using System.Collections.Generic;
 using System.Collections.Specialized;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.MaestroAPI.Feature;
-using OSGeo.MapGuide.ObjectModels.LoadProcedure;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using GeoAPI.Geometries;
-using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using System.IO;
+using System.Text;
 
+using ObjCommon = OSGeo.MapGuide.ObjectModels.Common;
+
 namespace OSGeo.MapGuide.MaestroAPI
 {
     /// <summary>
@@ -62,7 +63,7 @@
         protected XmlValidator m_validator;
 
         /// <summary>
-        /// The path of Xsd schemas 
+        /// The path of Xsd schemas
         /// </summary>
         protected string m_schemasPath;
 
@@ -82,7 +83,7 @@
         protected PlatformConnectionBase()
         {
             ResourceTypeRegistry.Init();
-            
+
             m_serializers = new Hashtable();
             m_validator = new XmlValidator();
             m_cachedSchemas = new Hashtable();
@@ -110,7 +111,7 @@
         /// <returns>The deserialized object</returns>
         virtual public object DeserializeObject(Type type, System.IO.Stream data)
         {
-            //HACK: MGOS 2.2 outputs different capabilities xml (because it's actually the correct one!), so 
+            //HACK: MGOS 2.2 outputs different capabilities xml (because it's actually the correct one!), so
             //without breaking support against 2.1 and older servers, we transform the xml to its pre-2.2 form
             if (type == typeof(FdoProviderCapabilities) && this.SiteVersion < new Version(2, 2))
             {
@@ -208,7 +209,7 @@
             return (System.Xml.Serialization.XmlSerializer)m_serializers[type];
         }
 
-        #endregion
+        #endregion Serialization plumbing
 
         #region Validation
 
@@ -240,13 +241,16 @@
                 throw new Exception("Untested with MapGuide Build > " + this.MaxTestedVersion.ToString()); //NOXLATE
         }
 
-        #endregion
+        #endregion Validation
 
         /// <summary>
         /// Gets the preview URL generator.
         /// </summary>
         /// <returns>The preview URL generator. Returns null if this connection does not support browser-based resource previews</returns>
-        public virtual OSGeo.MapGuide.MaestroAPI.Resource.Preview.IResourcePreviewUrlGenerator GetPreviewUrlGenerator() { return null; }
+        public virtual OSGeo.MapGuide.MaestroAPI.Resource.Preview.IResourcePreviewUrlGenerator GetPreviewUrlGenerator()
+        {
+            return null;
+        }
 
         /// <summary>
         /// Gets the name of the provider of this implementation
@@ -301,13 +305,13 @@
             }
 
             return (System.Xml.Schema.XmlSchema)m_cachedSchemas[type];
-        
         }
 
         /// <summary>
         /// Raised when a resource is added
         /// </summary>
         public event ResourceEventHandler ResourceAdded;
+
         /// <summary>
         /// Raised when a resource is deleted. Note if a folder is deleted, this will
         /// only be raised for the folder and not its children. Also note that this is
@@ -315,6 +319,7 @@
         /// purposes, deleted.
         /// </summary>
         public event ResourceEventHandler ResourceDeleted;
+
         /// <summary>
         /// Raised when a resource is updated
         /// </summary>
@@ -542,7 +547,7 @@
         abstract public ObjCommon.ResourceList GetRepositoryResources(string startingpoint, string type, int depth, bool computeChildren);
 
         /// <summary>
-        /// Forces a timestamp update of the specified resource. This is akin to 
+        /// Forces a timestamp update of the specified resource. This is akin to
         /// setting the resource's content using its existing content.
         /// </summary>
         /// <param name="resourceId"></param>
@@ -742,10 +747,8 @@
                         UpdateResourceReferences(v, oldresourcepath, newresourcepath, folderupdates, visited);
                     }
             }
-
         }
 
-
         /// <summary>
         /// Moves a resource, and subsequently updates all resources pointing to the old resource path
         /// </summary>
@@ -1009,7 +1012,6 @@
             if (la.Cancel)
                 return false;
 
-
             la.Progress = 0;
             la.StatusMessage = Strings.ProgressFindingFolderRefs;
             int pg = 0;
@@ -1194,7 +1196,6 @@
         /// <param name="overwrite">True if the move can overwrite an existing folder, false otherwise</param>
         abstract public void MoveFolder(string oldpath, string newpath, bool overwrite);
 
-
         /// <summary>
         /// Returns data from a resource as a memorystream
         /// </summary>
@@ -1411,7 +1412,6 @@
                 this.SetResourceXmlData(resourceID, null, this.SerializeObject(header));
         }
 
-
         /// <summary>
         /// Enumerates all unmanaged folders, meaning alias'ed folders
         /// </summary>
@@ -1422,7 +1422,7 @@
         /// <returns>A list of unmanaged data</returns>
         abstract public ObjCommon.UnmanagedDataList EnumerateUnmanagedData(string startpath, string filter, bool recursive, UnmanagedDataTypes type);
 
-        #endregion
+        #endregion Resource Service
 
         #region Feature Service
 
@@ -1453,7 +1453,6 @@
         /// </summary>
         abstract public ObjCommon.FeatureProviderRegistryFeatureProvider[] FeatureProviders { get; }
 
-
         /// <summary>
         /// Returns the spatial info for a given featuresource
         /// </summary>
@@ -1491,6 +1490,7 @@
         /// feature source description cache
         /// </summary>
         protected Dictionary<string, FeatureSourceDescription> m_featureSchemaCache = new Dictionary<string, FeatureSourceDescription>();
+
         /// <summary>
         /// a class definition cache
         /// </summary>
@@ -1510,14 +1510,14 @@
         /// <returns></returns>
         public virtual FeatureSourceDescription DescribeFeatureSource(string resourceID)
         {
-        #if DEBUG
+#if DEBUG
             bool bFromCache = true;
-        #endif
+#endif
             if (!m_featureSchemaCache.ContainsKey(resourceID))
             {
-            #if DEBUG
+#if DEBUG
                 bFromCache = false;
-            #endif
+#endif
                 var fsd = this.DescribeFeatureSourceInternal(resourceID);
                 try
                 {
@@ -1566,18 +1566,18 @@
             string classCacheKey = resourceID + "!" + className; //NOXLATE
             ClassDefinition cls = null;
             bool bStoreInCache = true;
-        #if DEBUG
+#if DEBUG
             bool bFromCache = false;
-        #endif
+#endif
             //We don't interrogate the Feature Source Description cache because part of
             //caching a Feature Source Description is to cache all the classes within
             if (m_classDefinitionCache.ContainsKey(classCacheKey))
             {
                 cls = m_classDefinitionCache[classCacheKey];
                 bStoreInCache = false;
-            #if DEBUG
+#if DEBUG
                 bFromCache = true;
-            #endif
+#endif
             }
             else
             {
@@ -1881,7 +1881,7 @@
         /// <returns>A <see cref="T:OSGeo.MapGuide.MaestroAPI.Feature.IFeatureReader"/> containing the results of the query</returns>
         public abstract IFeatureReader QueryFeatureSource(string resourceID, string className, string filter, string[] propertyNames, NameValueCollection computedProperties);
 
-        #endregion
+        #endregion Feature Service
 
         #region Feature/Capability Discovery
 
@@ -1941,7 +1941,7 @@
             }
         }
 
-        #endregion
+        #endregion Feature/Capability Discovery
 
         #region runtime map
 
@@ -1961,7 +1961,7 @@
             catch { return 1.0; }
         }
 
-        class DefaultCalculator : IMpuCalculator
+        private class DefaultCalculator : IMpuCalculator
         {
             private PlatformConnectionBase _conn;
 
@@ -2077,7 +2077,7 @@
             rtLayer.ShowInLegend = source.ShowInLegend;
             rtLayer.Visible = true;
             rtLayer.Type = RuntimeMapLayer.kBaseMap;
-            
+
             return rtLayer;
         }
 
@@ -2112,7 +2112,7 @@
             rtLayer.ShowInLegend = source.ShowInLegend;
             rtLayer.Group = source.Group;
             rtLayer.Visible = source.Visible;
-            
+
             return rtLayer;
         }
 
@@ -2123,8 +2123,8 @@
         /// <remarks>
         /// Calculation of meters-per-unit may differ between implementations. This may have an adverse
         /// effect on things such as rendering and measuring depending on the underlying implementation
-        /// 
-        /// If you are certain of the meters-per-unit value required, use the overloaded method that 
+        ///
+        /// If you are certain of the meters-per-unit value required, use the overloaded method that
         /// accepts a metersPerUnit parameter.
         /// </remarks>
         /// <param name="runtimeMapResourceId"></param>
@@ -2142,8 +2142,8 @@
         /// <remarks>
         /// Calculation of meters-per-unit may differ between implementations. This may have an adverse
         /// effect on things such as rendering and measuring depending on the underlying implementation
-        /// 
-        /// If you are certain of the meters-per-unit value required, use the overloaded method that 
+        ///
+        /// If you are certain of the meters-per-unit value required, use the overloaded method that
         /// accepts a metersPerUnit parameter.
         /// </remarks>
         /// <param name="runtimeMapResourceId"></param>
@@ -2188,7 +2188,7 @@
         }
 
         /// <summary>
-        /// Creates a new runtime map instance from an existing map definition.  The runtime map resource id is calculated from the 
+        /// Creates a new runtime map instance from an existing map definition.  The runtime map resource id is calculated from the
         /// current session id and the name component of the Map Definition resource id
         /// </summary>
         /// <param name="mdf"></param>
@@ -2199,7 +2199,7 @@
         }
 
         /// <summary>
-        /// Creates a new runtime map instance from an existing map definition.  The runtime map resource id is calculated from the 
+        /// Creates a new runtime map instance from an existing map definition.  The runtime map resource id is calculated from the
         /// current session id and the name component of the Map Definition resource id
         /// </summary>
         /// <param name="mdf"></param>
@@ -2244,8 +2244,8 @@
         /// <remarks>
         /// Calculation of meters-per-unit may differ between implementations. This may have an adverse
         /// effect on things such as rendering and measuring depending on the underlying implementation
-        /// 
-        /// If you are certain of the meters-per-unit value required, use the overloaded method that 
+        ///
+        /// If you are certain of the meters-per-unit value required, use the overloaded method that
         /// accepts a metersPerUnit parameter.
         /// </remarks>
         /// <param name="runtimeMapResourceId"></param>
@@ -2263,8 +2263,8 @@
         /// <remarks>
         /// Calculation of meters-per-unit may differ between implementations. This may have an adverse
         /// effect on things such as rendering and measuring depending on the underlying implementation
-        /// 
-        /// If you are certain of the meters-per-unit value required, use the overloaded method that 
+        ///
+        /// If you are certain of the meters-per-unit value required, use the overloaded method that
         /// accepts a metersPerUnit parameter.
         /// </remarks>
         /// <param name="runtimeMapResourceId"></param>
@@ -2327,8 +2327,9 @@
             map.IsDirty = false;
             return map;
         }
-        #endregion
 
+        #endregion runtime map
+
         #region Load Procedure
 
         /// <summary>
@@ -2359,6 +2360,6 @@
             return cmd.Execute(resourceID, callback);
         }
 
-        #endregion
+        #endregion Load Procedure
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OSGeo.MapGuide.MaestroAPI")]
@@ -11,8 +11,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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)]
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/BinaryData.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/BinaryData.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/BinaryData.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-// 
+//
 
 // Original code by Michael Potter, made available under Public Domain
 //
 // http://www.codeproject.com/Articles/6943/A-Generic-Reusable-Diff-Algorithm-in-C-II/
-#endregion
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.IO;
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Comparison
 {
     /*
@@ -54,8 +51,8 @@
                 if (br != null) br.Close();
                 if (fs != null) fs.Close();
             }
-
         }
+
         #region IDiffList Members
 
         public int Count()
@@ -68,7 +65,7 @@
             return _byteList[index];
         }
 
-        #endregion
+        #endregion IDiffList Members
     }
      */
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/CharData.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/CharData.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/CharData.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-// 
+//
 
 // Original code by Michael Potter, made available under Public Domain
 //
 // http://www.codeproject.com/Articles/6943/A-Generic-Reusable-Diff-Algorithm-in-C-II/
-#endregion
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Comparison
 {
     /*
@@ -37,6 +35,7 @@
         {
             _charList = charData.ToCharArray();
         }
+
         #region IDiffList Members
 
         public int Count()
@@ -49,7 +48,7 @@
             return _charList[index];
         }
 
-        #endregion
+        #endregion IDiffList Members
     }
      */
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/DiffEngine.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/DiffEngine.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/DiffEngine.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-// 
+//
 
 // Original code by Michael Potter, made available under Public Domain
 //
 // http://www.codeproject.com/Articles/6943/A-Generic-Reusable-Diff-Algorithm-in-C-II/
-#endregion
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Text;
-using System.Collections;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Comparison
 {
@@ -63,7 +62,9 @@
         private int _length;
 
         public int StartIndex { get { return _startIndex; } }
+
         public int EndIndex { get { return ((_startIndex + _length) - 1); } }
+
         public int Length
         {
             get
@@ -104,6 +105,7 @@
                         case -1:
                             stat = DiffStatus.NoMatch;
                             break;
+
                         default:
                             System.Diagnostics.Debug.Assert(_length == -2, "Invalid status: _length < -2"); //NOXLATE
                             stat = DiffStatus.Unknown;
@@ -139,7 +141,6 @@
             _length = (int)DiffStatus.NoMatch;
         }
 
-
         public bool HasValidLength(int newStart, int newEnd, int maxPossibleDestLength)
         {
             if (_length > 0) //have unlocked match
@@ -161,6 +162,7 @@
 #else
         private DiffState[] _array;
 #endif
+
         public DiffStateList(int destCount)
         {
 #if USE_HASH_TABLE
@@ -197,19 +199,22 @@
     public enum DiffResultSpanStatus
     {
         /// <summary>
-        /// 
+        ///
         /// </summary>
         NoChange,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Replace,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         DeleteSource,
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         AddDestination
     }
@@ -301,7 +306,9 @@
                 _sourceIndex.ToString(),
                 _length.ToString());
         }
+
         #region IComparable Members
+
         /// <summary>
         /// Compares this instance against the specified object
         /// </summary>
@@ -312,7 +319,7 @@
             return _destIndex.CompareTo(((DiffResultSpan)obj)._destIndex);
         }
 
-        #endregion
+        #endregion IComparable Members
     }
 
     /// <summary>
@@ -324,10 +331,12 @@
         /// Fast, but imperfect
         /// </summary>
         FastImperfect,
+
         /// <summary>
         /// A balanced trade between speed and perfection
         /// </summary>
         Medium,
+
         /// <summary>
         /// Slow, but perfect
         /// </summary>
@@ -374,7 +383,6 @@
 
         private void GetLongestSourceMatch(DiffState curItem, int destIndex, int destEnd, int sourceStart, int sourceEnd)
         {
-
             int maxDestLength = (destEnd - destIndex) + 1;
             int curLength = 0;
             int curBestLength = 0;
@@ -407,7 +415,6 @@
             {
                 curItem.SetMatch(curBestIndex, curBestLength);
             }
-
         }
 
         private void ProcessRange(int destStart, int destEnd, int sourceStart, int sourceEnd)
@@ -444,9 +451,10 @@
                                 curBestLength = curItem.Length;
                                 bestItem = curItem;
                             }
-                            //Jump over the match 
+                            //Jump over the match
                             destIndex += curItem.Length - 1;
                             break;
+
                         case DiffEngineLevel.Medium:
                             if (curItem.Length > curBestLength)
                             {
@@ -454,10 +462,11 @@
                                 curBestIndex = destIndex;
                                 curBestLength = curItem.Length;
                                 bestItem = curItem;
-                                //Jump over the match 
+                                //Jump over the match
                                 destIndex += curItem.Length - 1;
                             }
                             break;
+
                         default:
                             if (curItem.Length > curBestLength)
                             {
@@ -476,7 +485,6 @@
             }
             else
             {
-
                 int sourceIndex = bestItem.StartIndex;
                 _matchList.Add(DiffResultSpan.CreateNoChange(curBestIndex, sourceIndex, curBestLength));
                 if (destStart < curBestIndex)
@@ -533,7 +541,6 @@
             int dcount = _dest.Count();
             int scount = _source.Count();
 
-
             if ((dcount > 0) && (scount > 0))
             {
                 _stateList = new DiffStateList(dcount);
@@ -544,7 +551,6 @@
             return ts.TotalSeconds;
         }
 
-
         private bool AddChanges(
             List<DiffResultSpan> report,
             int curDest,
@@ -621,7 +627,6 @@
                 }
             }
 
-
             _matchList.Sort();
             int curDest = 0;
             int curSource = 0;
@@ -650,4 +655,4 @@
             return retval;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/TextFile.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/TextFile.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Comparison/TextFile.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-// 
+//
 
 // Original code by Michael Potter, made available under Public Domain
 //
 // http://www.codeproject.com/Articles/6943/A-Generic-Reusable-Diff-Algorithm-in-C-II/
-#endregion
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Collections;
 using System.IO;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Comparison
@@ -47,6 +47,7 @@
             Line = str.Replace("\t", "    "); //NOXLATE
             _hash = str.GetHashCode();
         }
+
         #region IComparable Members
 
         /// <summary>
@@ -59,7 +60,7 @@
             return _hash.CompareTo(((TextLine)obj)._hash);
         }
 
-        #endregion
+        #endregion IComparable Members
     }
 
     /// <summary>
@@ -89,7 +90,7 @@
             using (StreamReader sr = new StreamReader(fileName))
             {
                 String line;
-                // Read and display lines from the file until the end of 
+                // Read and display lines from the file until the end of
                 // the file is reached.
                 while ((line = sr.ReadLine()) != null)
                 {
@@ -105,7 +106,9 @@
                 catch { }
             }
         }
+
         #region IDiffList Members
+
         /// <summary>
         /// Gets the number of lines
         /// </summary>
@@ -114,6 +117,7 @@
         {
             return _lines.Count;
         }
+
         /// <summary>
         /// Gets the line at the specified index
         /// </summary>
@@ -124,7 +128,6 @@
             return _lines[index];
         }
 
-        #endregion
-
+        #endregion IDiffList Members
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Conversion/IResourceConverter.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Conversion/IResourceConverter.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Conversion/IResourceConverter.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
+using System.IO;
 using System.Text;
-using System.IO;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Conversion
 {
@@ -49,7 +51,7 @@
     /// ...
     /// IResourceConverter converter = new ResourceObjectConverter();
     /// ILayerDefinition converted = converter.Convert(layerDef, new Version(2, 3, 0));
-    /// 
+    ///
     /// Version convertedVersion = converted.ResourceVersion;
     /// // convertedVersion.Major == 2
     /// // convertedVersion.Minor == 3
@@ -92,4 +94,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Conversion/ImageSymbolConverter.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Conversion/ImageSymbolConverter.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Conversion/ImageSymbolConverter.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels;
-using ObjCommon = OSGeo.MapGuide.ObjectModels.Common;
 using OSGeo.MapGuide.ObjectModels.DrawingSource;
-using OSGeo.MapGuide.ObjectModels.SymbolLibrary;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -29,8 +30,7 @@
 using System.Drawing.Imaging;
 using System.Globalization;
 using System.IO;
-using System.Linq;
-using System.Text;
+using ObjCommon = OSGeo.MapGuide.ObjectModels.Common;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Conversion
 {
@@ -100,7 +100,7 @@
 
         /// <summary>
         /// Creates an image-based Symbol Definition in the specified folder for each image symbol in the Symbol Library.
-        /// 
+        ///
         /// Any existing resource names are overwritten
         /// </summary>
         /// <param name="targetFolder"></param>
@@ -187,7 +187,7 @@
                 throw new NotSupportedException();
         }
 
-        const int DPI = 96;
+        private const int DPI = 96;
 
         private static double PxToMillimeters(int pixels)
         {
@@ -228,4 +228,4 @@
             return ds;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Conversion/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Conversion/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Conversion/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,35 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Conversion
 {
     /// <summary>
-    /// The <c>OSGeo.MapGuide.MaestroAPI.Resource.Conversion</c> namespace provides classes and interfaces for 
+    /// The <c>OSGeo.MapGuide.MaestroAPI.Resource.Conversion</c> namespace provides classes and interfaces for
     /// upgrading resources to newer versions.
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/IResource.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/IResource.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/IResource.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.Common;
 using System;
-using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
 using System.Text;
-using System.Xml.Serialization;
-using System.IO;
-using System.ComponentModel;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource
 {
@@ -212,4 +212,4 @@
             res.CurrentConnection.ResourceService.DeleteResourceData(res.ResourceID, dataName);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/IResourceValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/IResourceValidator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/IResourceValidator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Resource
 {
     using Validation;
@@ -118,7 +117,7 @@
         /// Returns a hash code for this instance.
         /// </summary>
         /// <returns>
-        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
+        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
         /// </returns>
         public override int GetHashCode()
         {
@@ -145,13 +144,15 @@
         /// Indicates that the issue is non-vital, eg. a performance problem
         /// </summary>
         Information,
+
         /// <summary>
         /// Indicates that the issue is likely to cause problems
         /// </summary>
         Warning,
+
         /// <summary>
         /// Indicates that the issue will prevent correct operation of the map
         /// </summary>
         Error
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/IVersionedEntity.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/IVersionedEntity.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/IVersionedEntity.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml.Serialization;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource
 {
@@ -35,4 +35,4 @@
         /// <value>The resource version.</value>
         Version ResourceVersion { get; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource
@@ -29,7 +29,7 @@
     /// classes under the <c>OSGeo.MapGuide.ObjectModels</c> namespace use or implement.
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Preview/IResourcePreviewUrlGenerator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Preview/IResourcePreviewUrlGenerator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Preview/IResourcePreviewUrlGenerator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,35 @@
 #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
-using System;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Preview
 {
     public interface IResourcePreviewUrlGenerator
     {
         bool UseAjaxViewer { get; set; }
+
         bool AddDebugWatermark { get; set; }
 
         string GeneratePreviewUrl(OSGeo.MapGuide.MaestroAPI.Resource.IResource res, string locale, bool isNew, string sessionID);
+
         bool IsPreviewableType(string resourceType);
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Preview/ResourcePreviewUrlGenerator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Preview/ResourcePreviewUrlGenerator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Preview/ResourcePreviewUrlGenerator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,27 @@
 #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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Preview
 {
@@ -50,16 +50,22 @@
             {
                 case "FeatureSource":
                     return GenerateFeatureSourcePreviewUrl(res, locale, isNew, sessionID);
+
                 case "ApplicationDefinition":
                     return GenerateFlexLayoutPreviewUrl(res, locale, isNew, sessionID);
+
                 case "LayerDefinition":
                     return GenerateLayerPreviewUrl(res, locale, isNew, sessionID);
+
                 case "MapDefinition":
                     return GenerateMapPreviewUrl(res, locale, isNew, sessionID);
+
                 case "WebLayout":
                     return GenerateWebLayoutPreviewUrl(res, locale, isNew, sessionID);
+
                 case "WatermarkDefinition":
                     return GenerateWatermarkPreviewUrl((IWatermarkDefinition)res, locale, isNew, sessionID);
+
                 default:
                     throw new InvalidOperationException(Strings.UnpreviewableResourceType);
             }
@@ -91,4 +97,4 @@
             set;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/ResourceContentVersionChecker.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/ResourceContentVersionChecker.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/ResourceContentVersionChecker.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,36 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
 using System;
-using System.Collections.Generic;
+using System.IO;
 using System.Text;
-using System.IO;
 using System.Xml;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource
 {
     /// <summary>
     /// Inspects a resource content stream to determine the version of the resource content within
-    /// 
+    ///
     /// The stream to be inspected is copied and the inspection is made on the copy
     /// </summary>
     public sealed class ResourceContentVersionChecker : IDisposable
@@ -100,12 +102,11 @@
                     string typeStr = xsd.Substring(0, start);
 
                     return new ResourceTypeDescriptor(typeStr, version);
-
                 }
                 finally
                 {
                     xr.Close();
-                }   
+                }
             }
         }
 
@@ -121,4 +122,4 @@
                 _reader.Close();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/ResourceIdentifier.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/ResourceIdentifier.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/ResourceIdentifier.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource
 {
@@ -293,7 +294,6 @@
             else
                 newname += "." + GetExtension(identifier); //NOXLATE
 
-
             if (newname.IndexOf("/") > 0) //NOXLATE
                 throw new ArgumentException(Strings.ErrorResourceIdentifierNameInvalidChars, "newname");
             temp = temp.Substring(0, temp.Length - GetName(identifier).Length) + newname;
@@ -608,9 +608,8 @@
 
             return identifier;
         }
-    
 
-        #endregion
+        #endregion Static handlers
 
         /// <summary>
         /// Determines whether this resource id is session-based
@@ -624,4 +623,4 @@
             return resourceID.StartsWith("Session:"); //NOXLATE
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/ResourceSchemaChain.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/ResourceSchemaChain.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/ResourceSchemaChain.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Resource
 {
     /// <summary>
@@ -48,4 +47,4 @@
             return new string[] { schema, "PlatformCommon-1.0.0.xsd" }; //NOXLATE
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/ResourceTypeDescriptor.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/ResourceTypeDescriptor.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/ResourceTypeDescriptor.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Resource
 {
     /// <summary>
@@ -99,7 +98,7 @@
         /// Returns a hash code for this instance.
         /// </summary>
         /// <returns>
-        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
+        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
         /// </returns>
         public override int GetHashCode()
         {
@@ -186,4 +185,4 @@
             get { return new ResourceTypeDescriptor("WebLayout", "1.0.0"); } //NOXLATE
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ApplicationDefinitionValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ApplicationDefinitionValidator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ApplicationDefinitionValidator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
+using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
+using OSGeo.MapGuide.ObjectModels.Common;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using OSGeo.MapGuide.ObjectModels;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {
@@ -201,4 +202,4 @@
             get { return new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.ApplicationDefinition.ToString(), "1.0.0"); }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLayerDefinitionValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLayerDefinitionValidator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLayerDefinitionValidator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels.Common;
 using OSGeo.MapGuide.ObjectModels.DrawingSource;
-using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
+using System;
+using System.Collections.Generic;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {
@@ -179,7 +181,7 @@
                                 issues.Add(new ValidationIssue(resource, ValidationStatus.Warning, ValidationStatusCode.Warning_LayerDefinition_CompositeStyleDefinedAlongsideBasicStyle, string.Format(
                                     Strings.LDF_CompositeStyleDefinedAlongsideBasicStyle,
                                     vsr2.MinScale.HasValue ? vsr2.MinScale.Value : 0,
-                                    vsr2.MaxScale.HasValue ? vsr2.MaxScale.Value.ToString() : Strings.Infinity))); 
+                                    vsr2.MaxScale.HasValue ? vsr2.MaxScale.Value.ToString() : Strings.Infinity)));
                             }
 
                             if (vsr2.CompositeStyleCount > 0)
@@ -200,7 +202,6 @@
                                                         issues.Add(new ValidationIssue(resource, ValidationStatus.Error, ValidationStatusCode.Error_LayerDefinition_SymbolDefintionReferenceNotFound, string.Format(
                                                             Strings.LDF_SymbolDefintionReferenceNotFound, symRef.ResourceId)));
 
-
                                                     if (cls != null)
                                                     {
                                                         //warn if the symbol definition has usage contexts that are irrelevant against the layer's feature source
@@ -285,7 +286,6 @@
                         for (int j = i + 1; j < ranges.Count; j++)
                             if (ranges[i].Key > ranges[j].Value || ranges[i].Value > ranges[j].Value)
                                 issues.Add(new ValidationIssue(resource, ValidationStatus.Information, ValidationStatusCode.Info_LayerDefinition_ScaleRangeOverlap, string.Format(Strings.LDF_ScaleRangesOverlapInformation, ranges[i].Value, ranges[i].Key, ranges[j].Value, ranges[j].Key)));
-
                 }
             }
             else if (gldef != null)
@@ -384,4 +384,4 @@
             return rangeA.Key.CompareTo(rangeB.Key);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLoadProcedureValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLoadProcedureValidator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseLoadProcedureValidator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.ObjectModels.LoadProcedure;
+using OSGeo.MapGuide.ObjectModels.LoadProcedure;
+using System;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {
@@ -103,4 +101,4 @@
             return set.GetAllIssues();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseMapDefinitionValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseMapDefinitionValidator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseMapDefinitionValidator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
+using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.ObjectModels.Common;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {
@@ -150,7 +152,7 @@
                     {
                         issues.AddRange(ResourceValidatorSet.Validate(context, layer, recurse));
                     }
-                    
+
                     IVectorLayerDefinition vl = null;
                     if (layer.SubLayer.LayerType == LayerType.Vector)
                         vl = (IVectorLayerDefinition)layer.SubLayer;
@@ -181,7 +183,6 @@
                                     if (scList.SpatialContext.Count > 1)
                                         issues.Add(new ValidationIssue(resource, ValidationStatus.Information, ValidationStatusCode.Info_MapDefinition_MultipleSpatialContexts, string.Format(Strings.MDF_MultipleSpatialContextsInformation, fs.ResourceID)));
 
-
                                     bool skipGeomCheck = false;
 
                                     //TODO: Switch to the correct version (2.1), once released
@@ -223,7 +224,6 @@
                             issues.Add(new ValidationIssue(resource, ValidationStatus.Error, ValidationStatusCode.Error_MapDefinition_FeatureSourceRead, string.Format(Strings.MDF_FeatureSourceReadError, l.ResourceId, msg)));
                         }
                     }
-
                 }
                 catch (Exception ex)
                 {
@@ -237,4 +237,4 @@
             return issues.ToArray();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseSymbolDefinitionValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseSymbolDefinitionValidator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseSymbolDefinitionValidator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,7 +1,5 @@
-using System;
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {
@@ -156,4 +154,4 @@
             //TODO: Do the reverse check. Placeholders not pointing to a symbol parameter
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseWebLayoutValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseWebLayoutValidator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseWebLayoutValidator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,11 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
+using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.Common;
 using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using OSGeo.MapGuide.ObjectModels.WebLayout;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using OSGeo.MapGuide.ObjectModels;
+using System;
+using System.Collections.Generic;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {
@@ -152,4 +151,4 @@
             return issues.ToArray();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/DrawingSourceValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/DrawingSourceValidator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/DrawingSourceValidator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.DrawingSource;
+using System.Collections.Generic;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {
@@ -72,4 +71,4 @@
             get { return new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.DrawingSource.ToString(), "1.0.0"); } //NOXLATE
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/FeatureSourceValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/FeatureSourceValidator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/FeatureSourceValidator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
-using OSGeo.MapGuide.MaestroAPI;
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels.Common;
 using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using System;
+using System.Collections.Generic;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {
@@ -110,7 +108,7 @@
                                 issues.Add(new ValidationIssue(resource, ValidationStatus.Warning, ValidationStatusCode.Warning_FeatureSource_Potential_Bad_Join_Performance, string.Format(Strings.FS_PotentialBadJoinPerformance, ext.Name, bLeftSortable, bRightSortable)));
                             }
                         }
-                        else 
+                        else
                         {
                             issues.Add(new ValidationIssue(resource, ValidationStatus.Warning, ValidationStatusCode.Warning_FeatureSource_Potential_Bad_Join_Performance, string.Format(Strings.FS_PotentialBadJoinPerformance2, ext.Name)));
                         }
@@ -158,7 +156,7 @@
                     }
                 }
             }
-            
+
             //Note: Must be saved!
             string s = featSvc.TestConnection(feature.ResourceID);
             if (s.Trim().ToUpper() != true.ToString().ToUpper())
@@ -222,4 +220,4 @@
             get { return new ResourceTypeDescriptor(ResourceTypes.FeatureSource.ToString(), "1.0.0"); } //NOXLATE
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/LayerDefinitionValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/LayerDefinitionValidator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/LayerDefinitionValidator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {
     /// <summary>
@@ -41,4 +36,4 @@
             get { return new ResourceTypeDescriptor(ResourceTypes.LayerDefinition.ToString(), "1.0.0"); }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/LoadProcedureValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/LoadProcedureValidator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/LoadProcedureValidator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.ObjectModels.LoadProcedure;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {
     /// <summary>
@@ -39,4 +36,4 @@
             get { return new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.LoadProcedure.ToString(), "1.0.0"); }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/MapDefinitionValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/MapDefinitionValidator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/MapDefinitionValidator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,40 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using OSGeo.MapGuide.ObjectModels;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {
     /// <summary>
     /// A Map Definition validator
     /// </summary>
-    public class MapDefinitionValidator : BaseMapDefinitionValidator 
+    public class MapDefinitionValidator : BaseMapDefinitionValidator
     {
         /// <summary>
         /// Gets the resource type and version this validator supports
@@ -45,4 +36,4 @@
             get { return new ResourceTypeDescriptor(ResourceTypes.MapDefinition.ToString(), "1.0.0"); }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
@@ -29,7 +29,7 @@
     /// for common issues. The <see cref="T:OSGeo.MapGuide.MaestroAPI.Resource.Validation.ResourceValidatorSet"/> class provides the ability to validate resources
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/PrintLayoutValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/PrintLayoutValidator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/PrintLayoutValidator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.PrintLayout;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {
     /// <summary>
@@ -65,4 +61,4 @@
             return new ValidationIssue[0];
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ResourceValidationContext.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ResourceValidationContext.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ResourceValidationContext.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels.Capabilities;
+using OSGeo.MapGuide.ObjectModels.Common;
 using System.Collections.Generic;
-using System.Text;
 using System.Diagnostics;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.ObjectModels.Capabilities;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {
@@ -166,4 +166,4 @@
             return _resSvc.ResourceExists(resourceId);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ResourceValidatorLoader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ResourceValidatorLoader.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ResourceValidatorLoader.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {
     /// <summary>
@@ -53,4 +51,4 @@
             m_initialized = true;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ResourceValidatorSet.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ResourceValidatorSet.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ResourceValidatorSet.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {
@@ -125,4 +127,4 @@
             return found;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/SymbolDefinitionValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/SymbolDefinitionValidator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/SymbolDefinitionValidator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {
     /// <summary>
@@ -40,4 +36,4 @@
             get { return new ResourceTypeDescriptor(ResourceTypes.SymbolDefinition.ToString(), "1.0.0"); } //NOXLATE
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/SymbolLibraryValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/SymbolLibraryValidator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/SymbolLibraryValidator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {
     /// <summary>
@@ -64,4 +61,4 @@
             return new ValidationIssue[0];
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ValidationResultSet.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ValidationResultSet.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ValidationResultSet.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {
@@ -46,7 +46,8 @@
         /// Initializes a new instance of the <see cref="ValidationResultSet"/> class.
         /// </summary>
         /// <param name="issues">The issues.</param>
-        public ValidationResultSet(IEnumerable<ValidationIssue> issues) : this()
+        public ValidationResultSet(IEnumerable<ValidationIssue> issues)
+            : this()
         {
             Check.NotNull(issues, "issues"); //NOXLATE
 
@@ -157,4 +158,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ValidationStatusCode.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ValidationStatusCode.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ValidationStatusCode.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {
     /// <summary>
@@ -35,6 +34,7 @@
         Dummy = 0,
 
         #region information
+
         /// <summary>
         /// No primary key found in feature source. Does affect layer selection if a layer is based on this feature source
         /// </summary>
@@ -49,19 +49,19 @@
         /// A layer group has no label. Results in no text when displayed in the viewer legend
         /// </summary>
         Info_MapDefinition_GroupMissingLabelInformation = 1101,
-        
+
         /// <summary>
         /// A layer group has a default label assigned to it.
         /// </summary>
         Info_MapDefinition_GroupHasDefaultLabel,
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         Info_MapDefinition_MultipleSpatialContexts,
 
         /// <summary>
-        /// One or more scale ranges overlap. Can affect presentation of data. 
+        /// One or more scale ranges overlap. Can affect presentation of data.
         /// </summary>
         Info_LayerDefinition_ScaleRangeOverlap = 1201,
 
@@ -69,9 +69,11 @@
         /// A referenced symbol definition contains irrelevant usage contexts for this particular layer
         /// </summary>
         Info_LayerDefinition_IrrelevantUsageContext,
-        #endregion
 
+        #endregion information
+
         #region warnings
+
         /// <summary>
         /// Placeholder validation warning
         /// </summary>
@@ -86,7 +88,7 @@
         /// Feature Source has no spatial context. Affects re-projection if referencing layer is housed in a Map Definition
         /// </summary>
         Warning_FeatureSource_NoSpatialContext = 3101,
-        
+
         /// <summary>
         /// Feature Source has an empty spatial context
         /// </summary>
@@ -116,10 +118,10 @@
         /// in its encrypted state
         /// </summary>
         Warning_FeatureSource_Cannot_Package_Secured_Credentials,
-        
+
         /// <summary>
         /// A Feature Source whose provider contains username/password connection parameters contains login credentials in plaintext. This is not secure
-        /// as such Feature Sources can be accessed by the Anonymous MapGuide user account. It is strongly advised that such Feature Sources can be 
+        /// as such Feature Sources can be accessed by the Anonymous MapGuide user account. It is strongly advised that such Feature Sources can be
         /// re-secured with MapGuide/Infrastructure Studio or with Maestro 4.0.3 (or newer)
         /// </summary>
         Warning_FeatureSource_Plaintext_Credentials,
@@ -131,7 +133,7 @@
         Warning_FeatureSource_EmptyJoinPrefix,
 
         /// <summary>
-        /// An Extended Feature Class does not specify 
+        /// An Extended Feature Class does not specify
         /// </summary>
         Warning_FeatureSource_Potential_Bad_Join_Performance,
 
@@ -233,7 +235,7 @@
         Warning_LayerDefinition_MultipleGridScaleRanges,
 
         /// <summary>
-        /// A scale range was found in a Layer Definition which has a composite style defined along side a point, line or area style. In such cases, the 
+        /// A scale range was found in a Layer Definition which has a composite style defined along side a point, line or area style. In such cases, the
         /// composite style will always take precedence and the point/line/area style will have no effect
         /// </summary>
         Warning_LayerDefinition_CompositeStyleDefinedAlongsideBasicStyle,
@@ -253,9 +255,11 @@
         /// anywhere within the definition
         /// </summary>
         Warning_SymbolDefinition_SymbolParameterNotUsed = 3701,
-        #endregion
 
+        #endregion warnings
+
         #region errors
+
         /// <summary>
         /// General validation error that couldn't be categorized
         /// </summary>
@@ -286,7 +290,7 @@
         /// No finite display scales defined for a map definition that contains tiled layers.
         /// </summary>
         Error_MapDefinition_NoFiniteDisplayScales = 5201,
-        
+
         /// <summary>
         /// A raster layer in a Map Definition has a different coordinate system from the one that is declared in the
         /// Map Definition and the MapGuide Server we're connecting to does not support the raster re-projection feature (MGOS 2.0 or earlier)
@@ -312,7 +316,7 @@
         /// A layer belongs to a layer group that doesn't exist
         /// </summary>
         Error_MapDefinition_LayerWithNonExistentGroup,
-        
+
         /// <summary>
         /// A layer group belongs to a layer group that doesn't exist
         /// </summary>
@@ -469,6 +473,7 @@
         /// a non-existent resource data item
         /// </summary>
         Error_SymbolDefinition_ImageGraphicReferenceResourceDataNotFound,
-        #endregion
+
+        #endregion errors
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/WebLayoutValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/WebLayoutValidator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/WebLayoutValidator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.ObjectModels.WebLayout;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {
     /// <summary>
@@ -42,4 +36,4 @@
             get { return new ResourceTypeDescriptor(OSGeo.MapGuide.MaestroAPI.ResourceTypes.WebLayout.ToString(), "1.0.0"); } //NOXLATE
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ResourceTypeRegistry.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ResourceTypeRegistry.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ResourceTypeRegistry.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,52 +1,43 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Text;
 using System.Xml;
-using System.Xml.Serialization;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels.DrawingSource;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.ObjectModels.LoadProcedure;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.ObjectModels.PrintLayout;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-using OSGeo.MapGuide.ObjectModels.SymbolLibrary;
-using OSGeo.MapGuide.ObjectModels.WebLayout;
-using OSGeo.MapGuide.ObjectModels;
 
 namespace OSGeo.MapGuide.MaestroAPI
 {
     /// <summary>
-    /// 
+    ///
     /// </summary>
     public delegate IResource ResourceDeserializationCallback(string xml);
+
     /// <summary>
-    /// 
+    ///
     /// </summary>
     public delegate Stream ResourceSerializationCallback(IResource res);
 
@@ -151,8 +142,8 @@
                 new ResourceSerializer()
                 {
                     Serialize = (res) => { return res.SerializeToStream(); },
-                    Deserialize = (xml) => 
-                    { 
+                    Deserialize = (xml) =>
+                    {
                         //HACK: We have to peek at the XML to determine if this is simple or compound.
                         var doc = new XmlDocument();
                         doc.LoadXml(xml);
@@ -213,9 +204,9 @@
             RegisterResource(desc, new ResourceSerializer() { Deserialize = deserializeMethod, Serialize = serializeMethod });
         }
 
-        internal static void Init() 
-        { 
-            //does nothing, it's just for kicking the static constructor into gear 
+        internal static void Init()
+        {
+            //does nothing, it's just for kicking the static constructor into gear
         }
 
         /// <summary>
@@ -227,7 +218,7 @@
         public static IResource Deserialize(string resourceType, Stream stream)
         {
             //UGLY: We have to peek inside the stream to determine the version number
-            
+
             //House the stream inside a rewindable memory stream
             using (var ms = new MemoryStream())
             {
@@ -305,4 +296,4 @@
             return _serializers[rd].Deserialize(xml);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/ClassDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/ClassDefinition.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/ClassDefinition.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.Text;
+using System.Collections.ObjectModel;
 using System.Xml;
-using System.Collections.ObjectModel;
 
 namespace OSGeo.MapGuide.MaestroAPI.Schema
 {
@@ -121,7 +123,10 @@
         /// <summary>
         /// Removes the assigned identity properties
         /// </summary>
-        public void ClearIdentityProperties() { _identity.Clear(); }
+        public void ClearIdentityProperties()
+        {
+            _identity.Clear();
+        }
 
         /// <summary>
         /// Gets the properties
@@ -153,7 +158,7 @@
         /// <param name="prop"></param>
         public void AddProperty(PropertyDefinition prop)
         {
-            if (!_properties.Contains(prop)) 
+            if (!_properties.Contains(prop))
                 _properties.Add(prop);
             prop.Parent = this;
         }
@@ -424,4 +429,4 @@
             return clone;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/DataPropertyDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/DataPropertyDefinition.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/DataPropertyDefinition.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,46 +1,49 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.Common;
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Globalization;
-using System.Xml;
-using OSGeo.MapGuide.ObjectModels.Common;
 
 namespace OSGeo.MapGuide.MaestroAPI.Schema
 {
     /// <summary>
-    /// Derives from <see cref="T:OSGeo.MapGuide.MaestroAPI.Schema.PropertyDefinition"/> and represents simple values or 
-    /// collections of simple values. This can take on any of the data types listed in the 
-    /// <see cref="T:OSGeo.MapGuide.MaestroAPI.Schema.DataPropertyType"/> enumeration. 
+    /// Derives from <see cref="T:OSGeo.MapGuide.MaestroAPI.Schema.PropertyDefinition"/> and represents simple values or
+    /// collections of simple values. This can take on any of the data types listed in the
+    /// <see cref="T:OSGeo.MapGuide.MaestroAPI.Schema.DataPropertyType"/> enumeration.
     /// </summary>
     public class DataPropertyDefinition : PropertyDefinition
     {
-        private DataPropertyDefinition() { this.DataType = DataPropertyType.String; }
+        private DataPropertyDefinition()
+        {
+            this.DataType = DataPropertyType.String;
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DataPropertyDefinition"/> class.
         /// </summary>
         /// <param name="name">The name.</param>
         /// <param name="description">The description.</param>
-        public DataPropertyDefinition(string name, string description) 
+        public DataPropertyDefinition(string name, string description)
             : this()
         {
             this.Name = name;
@@ -138,25 +141,31 @@
                 case "xs:hexbinary": //NOXLATE
                 case "xs:base64binary": //NOXLATE
                     return DataPropertyType.Blob;
+
                 case "xs:boolean": //NOXLATE
                     return DataPropertyType.Boolean;
+
                 case "fdo:byte": //NOXLATE
                 case "xs:byte": //NOXLATE
                 case "xs:unsignedbyte": //NOXLATE
                     return DataPropertyType.Byte;
+
                 case "xs:date": //NOXLATE
                 case "xs:datetime": //NOXLATE
                     return DataPropertyType.DateTime;
+
                 case "fdo:double": //NOXLATE
                 case "fdo:decimal": //NOXLATE
                 case "xs:decimal": //NOXLATE
                 case "xs:double": //NOXLATE
                     return DataPropertyType.Double;
+
                 case "fdo:int16": //NOXLATE
                 case "xs:int16": //NOXLATE
                 case "xs:short": //NOXLATE
                 case "xs:unsignedshort": //NOXLATE
                     return DataPropertyType.Int16;
+
                 case "fdo:int32": //NOXLATE
                 case "xs:int32": //NOXLATE
                 case "xs:integer": //NOXLATE
@@ -167,19 +176,24 @@
                 case "xs:unsignedint": //NOXLATE
                 case "xs:int": //NOXLATE
                     return DataPropertyType.Int32;
+
                 case "fdo:int64": //NOXLATE
                 case "xs:int64": //NOXLATE
                 case "xs:long": //NOXLATE
                 case "xs:unsignedlong": //NOXLATE
                     return DataPropertyType.Int64;
+
                 case "xs:float": //NOXLATE
                 case "xs:single": //NOXLATE
                 case "fdo:single": //NOXLATE
                     return DataPropertyType.Single;
+
                 case "xs:string": //NOXLATE
                     return DataPropertyType.String;
+
                 case "fdo:clob": //NOXLATE
                     return DataPropertyType.Clob;
+
                 default:
                     throw new ArgumentException();
             }
@@ -223,7 +237,7 @@
 
                 rest.AppendChild(max);
             }
-            
+
             currentNode.AppendChild(prop);
         }
 
@@ -258,30 +272,40 @@
                    this.DataType == DataPropertyType.Single;
         }
 
-        static ExpressionDataType GetExpressionType(DataPropertyType dt)
+        private static ExpressionDataType GetExpressionType(DataPropertyType dt)
         {
             switch (dt)
             {
                 case DataPropertyType.Blob:
                     return ExpressionDataType.Data_Blob;
+
                 case DataPropertyType.Boolean:
                     return ExpressionDataType.Data_Boolean;
+
                 case DataPropertyType.Byte:
                     return ExpressionDataType.Data_Byte;
+
                 case DataPropertyType.Clob:
                     return ExpressionDataType.Data_Clob;
+
                 case DataPropertyType.DateTime:
                     return ExpressionDataType.Data_DateTime;
+
                 case DataPropertyType.Double:
                     return ExpressionDataType.Data_Double;
+
                 case DataPropertyType.Int16:
                     return ExpressionDataType.Data_Int16;
+
                 case DataPropertyType.Int32:
                     return ExpressionDataType.Data_Int32;
+
                 case DataPropertyType.Int64:
                     return ExpressionDataType.Data_Int64;
+
                 case DataPropertyType.Single:
                     return ExpressionDataType.Data_Single;
+
                 case DataPropertyType.String:
                     return ExpressionDataType.Data_String;
             }
@@ -296,4 +320,4 @@
             get { return GetExpressionType(this.DataType); }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/FeatureSchema.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/FeatureSchema.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/FeatureSchema.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,39 +1,44 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Collections.ObjectModel;
 using System.Xml;
 
 namespace OSGeo.MapGuide.MaestroAPI.Schema
 {
     /// <summary>
-    /// Contains all of the classes and relationships that make up a particular data model. This class is used to 
+    /// Contains all of the classes and relationships that make up a particular data model. This class is used to
     /// represent the internal logical structure of a Feature Source
     /// </summary>
     public class FeatureSchema : SchemaElement, IFdoSerializable
     {
         private List<ClassDefinition> _classes;
 
-        internal FeatureSchema() { _classes = new List<ClassDefinition>(); }
+        internal FeatureSchema()
+        {
+            _classes = new List<ClassDefinition>();
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="FeatureSchema"/> class.
@@ -59,8 +64,8 @@
         /// Adds the specified class definition
         /// </summary>
         /// <param name="cls"></param>
-        public void AddClass(ClassDefinition cls) 
-        { 
+        public void AddClass(ClassDefinition cls)
+        {
             _classes.Add(cls);
             cls.Parent = this;
         }
@@ -70,7 +75,7 @@
         /// </summary>
         /// <param name="cls"></param>
         /// <returns></returns>
-        public bool RemoveClass(ClassDefinition cls) 
+        public bool RemoveClass(ClassDefinition cls)
         {
             if (_classes.Remove(cls))
             {
@@ -100,7 +105,10 @@
         /// </summary>
         /// <param name="cls"></param>
         /// <returns></returns>
-        public int IndexOf(ClassDefinition cls) { return _classes.IndexOf(cls); }
+        public int IndexOf(ClassDefinition cls)
+        {
+            return _classes.IndexOf(cls);
+        }
 
         /// <summary>
         /// Gets the class definition at the specified index
@@ -117,7 +125,10 @@
         /// </summary>
         /// <param name="index"></param>
         /// <returns></returns>
-        public ClassDefinition GetItem(int index) { return _classes[index]; }
+        public ClassDefinition GetItem(int index)
+        {
+            return _classes[index];
+        }
 
         /// <summary>
         /// Writes the current element's content
@@ -217,4 +228,4 @@
             return clone;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/FeatureSourceDescription.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/FeatureSourceDescription.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/FeatureSourceDescription.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
+using System.Collections.Generic;
 using System.Xml;
-using System.Collections.Generic;
 
 namespace OSGeo.MapGuide.MaestroAPI.Schema
 {
@@ -205,4 +208,4 @@
             return new FeatureSourceDescription(schemas, fsd.IsPartial);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/GeometricPropertyDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/GeometricPropertyDefinition.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/GeometricPropertyDefinition.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.Text;
-using System.Xml;
 
 namespace OSGeo.MapGuide.MaestroAPI.Schema
 {
@@ -34,18 +35,22 @@
         /// Points
         /// </summary>
         Point = 1,
+
         /// <summary>
         /// Curves (lines)
         /// </summary>
         Curve = 2,
+
         /// <summary>
         /// Surfaces (polygons)
         /// </summary>
         Surface = 4,
+
         /// <summary>
         /// Solids
         /// </summary>
         Solid = 8,
+
         /// <summary>
         /// All types
         /// </summary>
@@ -61,42 +66,52 @@
         /// Points
         /// </summary>
         Point = 1,
+
         /// <summary>
         /// Line Strings
         /// </summary>
         LineString = 2,
+
         /// <summary>
         /// Polygons
         /// </summary>
         Polygon = 3,
+
         /// <summary>
         /// Multi Points
         /// </summary>
         MultiPoint = 4,
+
         /// <summary>
         /// Multi Line Strings
         /// </summary>
         MultiLineString = 5,
+
         /// <summary>
         /// Multi Polygons
         /// </summary>
         MultiPolygon = 6,
+
         /// <summary>
         /// Multi Geometries
         /// </summary>
         MultiGeometry = 7,
+
         /// <summary>
         /// Curve Strings
         /// </summary>
         CurveString = 10,
+
         /// <summary>
         /// Curve Polygons
         /// </summary>
         CurvePolygon = 11,
+
         /// <summary>
         /// Multi Curve Strings
         /// </summary>
         MultiCurveString = 12,
+
         /// <summary>
         /// Multi Curve Polygons
         /// </summary>
@@ -108,7 +123,10 @@
     /// </summary>
     public class GeometricPropertyDefinition : PropertyDefinition
     {
-        private GeometricPropertyDefinition() { this.SpecificGeometryTypes = new SpecificGeometryType[0]; }
+        private GeometricPropertyDefinition()
+        {
+            this.SpecificGeometryTypes = new SpecificGeometryType[0];
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="GeometricPropertyDefinition"/> class.
@@ -123,31 +141,31 @@
         }
 
         /// <summary>
-        /// Gets or sets a Boolean value that indicates if this geometric property is read-only. 
+        /// Gets or sets a Boolean value that indicates if this geometric property is read-only.
         /// </summary>
         public bool IsReadOnly { get; set; }
 
         /// <summary>
-        /// Gets or sets a Boolean value that indicates if the geometry of this property includes measurement values that can be used for dynamic segmentation. 
+        /// Gets or sets a Boolean value that indicates if the geometry of this property includes measurement values that can be used for dynamic segmentation.
         /// </summary>
         public bool HasMeasure { get; set; }
 
         /// <summary>
-        /// Gets or sets a Boolean value that indicates if the geometry of this property include elevation values. 
+        /// Gets or sets a Boolean value that indicates if the geometry of this property include elevation values.
         /// </summary>
         public bool HasElevation { get; set; }
 
         /// <summary>
-        /// Gets or sets the Spatial Context name associated to this geometric property. 
+        /// Gets or sets the Spatial Context name associated to this geometric property.
         /// </summary>
         public string SpatialContextAssociation { get; set; }
 
         private FeatureGeometricType _geometricTypes;
 
         /// <summary>
-        /// Gets or sets the <see cref="T:OSGeo.MapGuide.MaestroAPI.Schema.FeatureGeometricType"/> that can be stored in this geometric 
-        /// property. The returned value may be any combination of the values from the <see cref="T:OSGeo.MapGuide.MaestroAPI.Schema.FeatureGeometricType"/> 
-        /// enumeration combined via a bit-wise or operation. 
+        /// Gets or sets the <see cref="T:OSGeo.MapGuide.MaestroAPI.Schema.FeatureGeometricType"/> that can be stored in this geometric
+        /// property. The returned value may be any combination of the values from the <see cref="T:OSGeo.MapGuide.MaestroAPI.Schema.FeatureGeometricType"/>
+        /// enumeration combined via a bit-wise or operation.
         /// </summary>
         public FeatureGeometricType GeometricTypes
         {
@@ -167,12 +185,14 @@
                                 sgts.Add(SpecificGeometryType.Point, SpecificGeometryType.Point);
                                 sgts.Add(SpecificGeometryType.MultiPoint, SpecificGeometryType.MultiPoint);
                                 break;
+
                             case FeatureGeometricType.Curve:
                                 sgts.Add(SpecificGeometryType.LineString, SpecificGeometryType.LineString);
                                 sgts.Add(SpecificGeometryType.MultiLineString, SpecificGeometryType.MultiLineString);
                                 sgts.Add(SpecificGeometryType.CurveString, SpecificGeometryType.CurveString);
                                 sgts.Add(SpecificGeometryType.MultiCurveString, SpecificGeometryType.MultiCurveString);
                                 break;
+
                             case FeatureGeometricType.Surface:
                                 sgts.Add(SpecificGeometryType.Polygon, SpecificGeometryType.Polygon);
                                 sgts.Add(SpecificGeometryType.MultiPolygon, SpecificGeometryType.MultiPolygon);
@@ -190,8 +210,8 @@
         private SpecificGeometryType[] _sgts;
 
         /// <summary>
-        /// Gets or sets the specific set of geometry types that can be stored in this geometric property. The provided value is a 
-        /// list of geometry types that are supported. Usually, one specific type is supported, but there can be more than one. 
+        /// Gets or sets the specific set of geometry types that can be stored in this geometric property. The provided value is a
+        /// list of geometry types that are supported. Usually, one specific type is supported, but there can be more than one.
         /// </summary>
         public SpecificGeometryType[] SpecificGeometryTypes
         {
@@ -272,7 +292,7 @@
             var en = Utility.EncodeFDOName(this.Name);
 
             var geom = doc.CreateElement("xs", "element", XmlNamespaces.XS); //NOXLATE
-            
+
             geom.SetAttribute("name", en); //NOXLATE
             geom.SetAttribute("type", "gml:AbstractGeometryType"); //NOXLATE
             geom.SetAttribute("hasMeasure", XmlNamespaces.FDO, this.HasMeasure.ToString().ToLower()); //NOXLATE
@@ -378,33 +398,43 @@
                     case "curvepolygon": //NOXLATE
                         values.Add(SpecificGeometryType.CurvePolygon);
                         break;
+
                     case "curvestring": //NOXLATE
                         values.Add(SpecificGeometryType.CurveString);
                         break;
+
                     case "linestring": //NOXLATE
                         values.Add(SpecificGeometryType.LineString);
                         break;
+
                     case "multicurvepolygon": //NOXLATE
                         values.Add(SpecificGeometryType.MultiCurvePolygon);
                         break;
+
                     case "multicurvestring": //NOXLATE
                         values.Add(SpecificGeometryType.MultiCurveString);
                         break;
+
                     case "multigeometry": //NOXLATE
                         values.Add(SpecificGeometryType.MultiGeometry);
                         break;
+
                     case "multilinestring": //NOXLATE
                         values.Add(SpecificGeometryType.MultiLineString);
                         break;
+
                     case "multipoint": //NOXLATE
                         values.Add(SpecificGeometryType.MultiPoint);
                         break;
+
                     case "multipolygon": //NOXLATE
                         values.Add(SpecificGeometryType.MultiPolygon);
                         break;
+
                     case "point": //NOXLATE
                         values.Add(SpecificGeometryType.Point);
                         break;
+
                     case "polygon": //NOXLATE
                         values.Add(SpecificGeometryType.Polygon);
                         break;
@@ -429,6 +459,7 @@
                                 gt = FeatureGeometricType.Point;
                         }
                         break;
+
                     case "curve": //NOXLATE
                         {
                             if (gt.HasValue)
@@ -437,6 +468,7 @@
                                 gt = FeatureGeometricType.Curve;
                         }
                         break;
+
                     case "surface": //NOXLATE
                         {
                             if (gt.HasValue)
@@ -445,6 +477,7 @@
                                 gt = FeatureGeometricType.Surface;
                         }
                         break;
+
                     case "solid": //NOXLATE
                         {
                             if (gt.HasValue)
@@ -469,4 +502,4 @@
             get { return OSGeo.MapGuide.ObjectModels.Common.ExpressionDataType.Geometry; }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/IFdoSerializable.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/IFdoSerializable.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/IFdoSerializable.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
+//
+
+#endregion Disclaimer / License
+
 using System.Xml;
 
 namespace OSGeo.MapGuide.MaestroAPI.Schema
@@ -36,6 +35,7 @@
         /// <param name="doc"></param>
         /// <param name="currentNode"></param>
         void WriteXml(XmlDocument doc, XmlNode currentNode);
+
         /// <summary>
         /// Set the current element's content from the current XML node
         /// </summary>
@@ -43,4 +43,4 @@
         /// <param name="mgr"></param>
         void ReadXml(XmlNode node, XmlNamespaceManager mgr);
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,35 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace OSGeo.MapGuide.MaestroAPI.Schema
 {
     /// <summary>
-    /// The <c>OSGeo.MapGuide.MaestroAPI.Schema</c> namespace provides classes and interfaces for working with the 
+    /// The <c>OSGeo.MapGuide.MaestroAPI.Schema</c> namespace provides classes and interfaces for working with the
     /// schema of a MapGuide Feature Source
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/PropertyDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/PropertyDefinition.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/PropertyDefinition.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.Common;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
-using OSGeo.MapGuide.ObjectModels.Common;
 
 namespace OSGeo.MapGuide.MaestroAPI.Schema
 {
@@ -34,18 +34,22 @@
         /// Data Properties
         /// </summary>
         Data = 100,
+
         /// <summary>
         /// Geometric Properties
         /// </summary>
         Geometry = 102,
+
         /// <summary>
         /// Raster Properties
         /// </summary>
         Raster = 104,
+
         /// <summary>
         /// Association Properties
         /// </summary>
         Association = 103,
+
         /// <summary>
         /// Object Properties
         /// </summary>
@@ -61,58 +65,72 @@
         /// BLOB
         /// </summary>
         Blob = 10,
+
         /// <summary>
         /// Boolean
         /// </summary>
         Boolean = 1,
+
         /// <summary>
         /// Byte
         /// </summary>
         Byte = 2,
+
         /// <summary>
         /// CLOB
         /// </summary>
         Clob = 11,
+
         /// <summary>
         /// DateTime
         /// </summary>
         DateTime = 3,
+
         /// <summary>
         /// Double
         /// </summary>
         Double = 5,
+
         /// <summary>
         /// Feature
         /// </summary>
         Feature = 12,
+
         /// <summary>
         /// Geometry
         /// </summary>
         Geometry = 13,
+
         /// <summary>
         /// Int16
         /// </summary>
         Int16 = 6,
+
         /// <summary>
         /// Int32
         /// </summary>
         Int32 = 7,
+
         /// <summary>
         /// Int64
         /// </summary>
         Int64 = 8,
+
         /// <summary>
         /// Invalid or Unknown
         /// </summary>
         Null = 0,
+
         /// <summary>
         /// Raster
         /// </summary>
         Raster = 14,
+
         /// <summary>
         /// Single
         /// </summary>
         Single = 4,
+
         /// <summary>
         /// String
         /// </summary>
@@ -128,42 +146,52 @@
         /// BLOB
         /// </summary>
         Blob = PropertyValueType.Blob,
+
         /// <summary>
         /// Boolean
         /// </summary>
         Boolean = PropertyValueType.Boolean,
+
         /// <summary>
         /// Byte
         /// </summary>
         Byte = PropertyValueType.Byte,
+
         /// <summary>
         /// CLOB
         /// </summary>
         Clob = PropertyValueType.Clob,
+
         /// <summary>
         /// DateTime
         /// </summary>
         DateTime = PropertyValueType.DateTime,
+
         /// <summary>
         /// Double
         /// </summary>
         Double = PropertyValueType.Double,
+
         /// <summary>
         /// Int16
         /// </summary>
         Int16 = PropertyValueType.Int16,
+
         /// <summary>
         /// Int32
         /// </summary>
         Int32 = PropertyValueType.Int32,
+
         /// <summary>
         /// Int64
         /// </summary>
         Int64 = PropertyValueType.Int64,
+
         /// <summary>
         /// Single
         /// </summary>
         Single = PropertyValueType.Single,
+
         /// <summary>
         /// String
         /// </summary>
@@ -304,4 +332,4 @@
             throw new ArgumentException();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/RasterPropertyDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/RasterPropertyDefinition.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/RasterPropertyDefinition.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.Schema
 {
     /// <summary>
-    /// Has the information needed to create or completely describe a raster property. This class encapsulates the information 
-    /// necessary to insert a 'new' raster, in the absence of any other information, for the properties defined using this schema element. 
+    /// Has the information needed to create or completely describe a raster property. This class encapsulates the information
+    /// necessary to insert a 'new' raster, in the absence of any other information, for the properties defined using this schema element.
     /// </summary>
     public class RasterPropertyDefinition : PropertyDefinition
     {
@@ -41,27 +42,27 @@
         }
 
         /// <summary>
-        /// Gets or sets the default size of image file in the horizontal direction in pixels (number of columns). 
+        /// Gets or sets the default size of image file in the horizontal direction in pixels (number of columns).
         /// </summary>
         public int DefaultImageXSize { get; set; }
 
         /// <summary>
-        /// Gets or sets the default size of an image file in the vertical direction in pixels (number of rows). 
+        /// Gets or sets the default size of an image file in the vertical direction in pixels (number of rows).
         /// </summary>
         public int DefaultImageYSize { get; set; }
 
         /// <summary>
-        /// Gets or sets whether this property's value can be null. 
+        /// Gets or sets whether this property's value can be null.
         /// </summary>
         public bool IsNullable { get; set; }
 
         /// <summary>
-        /// Gets or sets whether this property is read-only. 
+        /// Gets or sets whether this property is read-only.
         /// </summary>
         public bool IsReadOnly { get; set; }
 
         /// <summary>
-        /// Gets or sets the Spatial Context name associated to this raster property. 
+        /// Gets or sets the Spatial Context name associated to this raster property.
         /// </summary>
         public string SpatialContextAssociation { get; set; }
 
@@ -83,7 +84,7 @@
             var en = Utility.EncodeFDOName(this.Name);
 
             var geom = doc.CreateElement("xs", "element", XmlNamespaces.XS); //NOXLATE
-            
+
             geom.SetAttribute("name", en); //NOXLATE
             geom.SetAttribute("type", "fdo:RasterPropertyType"); //NOXLATE
             geom.SetAttribute("defaultImageXSize", XmlNamespaces.FDO, this.DefaultImageXSize.ToString()); //NOXLATE
@@ -115,7 +116,7 @@
             this.DefaultImageXSize = Convert.ToInt32(dix.Value);
             this.DefaultImageYSize = Convert.ToInt32(diy.Value);
 
-            //TODO: Just copypasta'd from DataPropertyDefinition assuming the same attributes would be used 
+            //TODO: Just copypasta'd from DataPropertyDefinition assuming the same attributes would be used
             //to indicate nullability and read-only states. Would be nice to verify with an actual example property
             this.IsNullable = (node.Attributes["minOccurs"] != null && node.Attributes["minOccurs"].Value == "0"); //NOXLATE
             this.IsReadOnly = (ro != null && ro.Value == "true"); //NOXLATE
@@ -131,4 +132,4 @@
             get { return OSGeo.MapGuide.ObjectModels.Common.ExpressionDataType.Raster; }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/SchemaElement.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/SchemaElement.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/SchemaElement.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Schema
 {
     /// <summary>
@@ -38,4 +37,4 @@
         /// </summary>
         public string Description { get; set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/XmlNamespaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/XmlNamespaces.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/XmlNamespaces.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Schema
 {
     /// <summary>
@@ -32,25 +31,30 @@
         /// XML Schema namespace
         /// </summary>
         public const string XS = "http://www.w3.org/2001/XMLSchema"; //NOXLATE
+
         /// <summary>
         /// XML Schema Instance namespace
         /// </summary>
         public const string XSI = "http://www.w3.org/2001/XMLSchema-instance"; //NOXLATE
+
         /// <summary>
         /// XLink namespace
         /// </summary>
         public const string XLINK = "http://www.w3.org/1999/xlink"; //NOXLATE
+
         /// <summary>
         /// GML (Geography Markup Language) namespace
         /// </summary>
         public const string GML = "http://www.opengis.net/gml"; //NOXLATE
+
         /// <summary>
         /// FDO (Feature Data Objects) namespace
         /// </summary>
         public const string FDO = "http://fdo.osgeo.org/schemas"; //NOXLATE
+
         /// <summary>
         /// FDS namespace
         /// </summary>
         public const string FDS = "http://fdo.osgeo.org/schemas/fds"; //NOXLATE
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/ConfigurationDocument.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/ConfigurationDocument.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/ConfigurationDocument.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.ObjectModels.Common;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.ObjectModels.Common;
 using System.Xml;
 
 namespace OSGeo.MapGuide.MaestroAPI.SchemaOverrides
@@ -44,8 +46,8 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="ConfigurationDocument"/> class.
         /// </summary>
-        protected ConfigurationDocument() 
-        { 
+        protected ConfigurationDocument()
+        {
             _spatialContexts = new List<IFdoSpatialContext>();
             _schemas = new List<FeatureSchema>();
         }
@@ -64,13 +66,19 @@
         /// Adds the spatial context.
         /// </summary>
         /// <param name="context">The context.</param>
-        public void AddSpatialContext(IFdoSpatialContext context) { _spatialContexts.Add(context); }
+        public void AddSpatialContext(IFdoSpatialContext context)
+        {
+            _spatialContexts.Add(context);
+        }
 
         /// <summary>
         /// Removes the spatial context.
         /// </summary>
         /// <param name="context">The context.</param>
-        public void RemoveSpatialContext(IFdoSpatialContext context) { _spatialContexts.Remove(context); }
+        public void RemoveSpatialContext(IFdoSpatialContext context)
+        {
+            _spatialContexts.Remove(context);
+        }
 
         /// <summary>
         /// Gets the spatial context by name
@@ -107,13 +115,19 @@
         /// Adds the logical schema.
         /// </summary>
         /// <param name="schema">The schema.</param>
-        public void AddSchema(FeatureSchema schema) { _schemas.Add(schema); }
+        public void AddSchema(FeatureSchema schema)
+        {
+            _schemas.Add(schema);
+        }
 
         /// <summary>
         /// Removes the logical schema.
         /// </summary>
         /// <param name="schema">The schema.</param>
-        public void RemoveSchema(FeatureSchema schema) { _schemas.Remove(schema); }
+        public void RemoveSchema(FeatureSchema schema)
+        {
+            _schemas.Remove(schema);
+        }
 
         /// <summary>
         /// Gets the schema by name.
@@ -164,7 +178,7 @@
             {
                 sc.WriteXml(doc, dstore);
             }
-            
+
             WriteSchemaMappings(doc, dstore);
             currentNode.AppendChild(dstore);
         }
@@ -257,9 +271,9 @@
             //Sample the first schema mapping node. Even if there are multiples
             //they will all be the same provider
 
-            //NOTE: Why does the XPath query (commented out) fail? 
+            //NOTE: Why does the XPath query (commented out) fail?
 
-            var map = root.LastChild; //root.SelectSingleNode("SchemaMapping"); 
+            var map = root.LastChild; //root.SelectSingleNode("SchemaMapping");
             if (map != null && map.Name == "SchemaMapping") //NOXLATE
             {
                 var prov = map.Attributes["provider"]; //NOXLATE
@@ -297,4 +311,4 @@
             return LoadInternal(doc);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/GdalConfigurationDocument.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/GdalConfigurationDocument.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/GdalConfigurationDocument.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.Common;
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Xml;
-using OSGeo.MapGuide.ObjectModels.Common;
 
 namespace OSGeo.MapGuide.MaestroAPI.SchemaOverrides
 {
@@ -200,4 +202,4 @@
             return false;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/GdalRasterItem.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/GdalRasterItem.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/GdalRasterItem.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.ObjectModels.Common;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Schema;
+using System.Globalization;
 using System.IO;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels;
-using System.Globalization;
 
 namespace OSGeo.MapGuide.MaestroAPI.SchemaOverrides
 {
@@ -44,7 +46,7 @@
         /// Adds the specified raster image reference
         /// </summary>
         /// <param name="item"></param>
-        public void AddItem(GdalRasterItem item) 
+        public void AddItem(GdalRasterItem item)
         {
             if (!_items.ContainsKey(item.FileName))
                 _items.Add(item.FileName, item);
@@ -73,9 +75,9 @@
         /// Removes the specified raster image reference
         /// </summary>
         /// <param name="item"></param>
-        public void RemoveItem(GdalRasterItem item) 
-        { 
-            _items.Remove(item.FileName); 
+        public void RemoveItem(GdalRasterItem item)
+        {
+            _items.Remove(item.FileName);
         }
 
         /// <summary>
@@ -97,7 +99,7 @@
 
             foreach (var item in _items.Values)
             {
-                item.WriteXml(doc, loc);   
+                item.WriteXml(doc, loc);
             }
 
             currentNode.AppendChild(loc);
@@ -258,4 +260,4 @@
             this.MaxY = Convert.ToDouble(maxy.InnerText);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/GenericConfigurationDocument.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/GenericConfigurationDocument.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/GenericConfigurationDocument.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Xml;
 
 namespace OSGeo.MapGuide.MaestroAPI.SchemaOverrides
@@ -35,7 +35,10 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="GenericConfigurationDocument"/> class.
         /// </summary>
-        public GenericConfigurationDocument() { _mappings = new XmlNode[0]; }
+        public GenericConfigurationDocument()
+        {
+            _mappings = new XmlNode[0];
+        }
 
         /// <summary>
         /// Write this document's schema mappings to the given XML document
@@ -68,4 +71,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace OSGeo.MapGuide.MaestroAPI.SchemaOverrides
@@ -29,7 +29,7 @@
     /// and creating Feature Source configuration documents.
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/OdbcConfigurationDocument.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/OdbcConfigurationDocument.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/OdbcConfigurationDocument.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 using System.Xml;
 
 namespace OSGeo.MapGuide.MaestroAPI.SchemaOverrides
@@ -36,14 +37,17 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="OdbcConfigurationDocument"/> class.
         /// </summary>
-        public OdbcConfigurationDocument() { _tables = new List<OdbcTableItem>(); }
+        public OdbcConfigurationDocument()
+        {
+            _tables = new List<OdbcTableItem>();
+        }
 
         /// <summary>
         /// Adds the specified table override
         /// </summary>
         /// <param name="item"></param>
-        public void AddOverride(OdbcTableItem item) 
-        { 
+        public void AddOverride(OdbcTableItem item)
+        {
             _tables.Add(item);
             item.Parent = this;
         }
@@ -51,7 +55,10 @@
         /// <summary>
         /// Removes all table overrides
         /// </summary>
-        public void ClearMappings() { _tables.Clear(); }
+        public void ClearMappings()
+        {
+            _tables.Clear();
+        }
 
         /// <summary>
         /// Gets the table overrides for the specified schema
@@ -174,4 +181,4 @@
             return null;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/OdbcTableItem.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/OdbcTableItem.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/OdbcTableItem.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 
 namespace OSGeo.MapGuide.MaestroAPI.SchemaOverrides
 {
@@ -55,7 +56,7 @@
         /// Gets or sets the name of the column which contains the Y coordinates of the point features
         /// </summary>
         public string YColumn { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the name of the column which contains the Z coordinates of the point features
         /// </summary>
@@ -150,7 +151,7 @@
             var table = node["Table"]; //NOXLATE
             var el = table.NextSibling;
             //foreach (System.Xml.XmlNode el in table.ChildNodes)
-            while(el != null)
+            while (el != null)
             {
                 var colName = el.Attributes["name"]; //NOXLATE
 
@@ -171,4 +172,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/RasterWmsItem.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/RasterWmsItem.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/RasterWmsItem.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels;
 using System.Drawing;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 using System.Xml;
 
 namespace OSGeo.MapGuide.MaestroAPI.SchemaOverrides
@@ -42,21 +42,26 @@
             /// Portable Network Graphics (PNG)
             /// </summary>
             public const string PNG = "PNG"; //NOXLATE
+
             /// <summary>
             /// Tagged Image File (TIF)
             /// </summary>
             public const string TIF = "TIF"; //NOXLATE
+
             /// <summary>
             /// Joint Photographic Experts Group (JPEG)
             /// </summary>
             public const string JPG = "JPG"; //NOXLATE
+
             /// <summary>
             /// Graphics Interchange Format (GIF)
             /// </summary>
             public const string GIF = "GIF"; //NOXLATE
         }
 
-        internal RasterWmsItem() { }
+        internal RasterWmsItem()
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RasterWmsItem"/> class.
@@ -119,13 +124,19 @@
         /// Adds a WMS layer configuration element.
         /// </summary>
         /// <param name="layer">The layer.</param>
-        public void AddLayer(WmsLayerDefinition layer) { _layers.Add(layer); }
+        public void AddLayer(WmsLayerDefinition layer)
+        {
+            _layers.Add(layer);
+        }
 
         /// <summary>
         /// Removes the given WMS layer configuration element
         /// </summary>
         /// <param name="layer">The layer.</param>
-        public void RemoveLayer(WmsLayerDefinition layer) { _layers.Remove(layer); }
+        public void RemoveLayer(WmsLayerDefinition layer)
+        {
+            _layers.Remove(layer);
+        }
 
         /// <summary>
         /// Gets or sets a value indicating whether tile caching is used
@@ -190,12 +201,15 @@
                         case WmsImageFormat.GIF:
                             mimeType.InnerText = "image/gif"; //NOXLATE
                             break;
+
                         case WmsImageFormat.JPG:
                             mimeType.InnerText = "image/jpeg"; //NOXLATE
                             break;
+
                         case WmsImageFormat.PNG:
                             mimeType.InnerText = "image/png"; //NOXLATE
                             break;
+
                         case WmsImageFormat.TIF:
                             mimeType.InnerText = "image/tiff"; //NOXLATE
                             break;
@@ -278,7 +292,7 @@
                     else
                         this.BackgroundColor = ColorTranslator.FromHtml("#" + bgcolor.InnerText); //NOXLATE
                 }
-                else 
+                else
                 {
                     this.BackgroundColor = default(Color);
                 }
@@ -313,4 +327,4 @@
             _layers.Clear();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/WmsConfigurationDocument.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/WmsConfigurationDocument.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/WmsConfigurationDocument.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.ObjectModels.Common;
 using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Xml;
 
 namespace OSGeo.MapGuide.MaestroAPI.SchemaOverrides
@@ -43,13 +45,19 @@
         /// Adds the specified override item
         /// </summary>
         /// <param name="item"></param>
-        public void AddRasterItem(RasterWmsItem item) { _rasterItems.Add(item); }
+        public void AddRasterItem(RasterWmsItem item)
+        {
+            _rasterItems.Add(item);
+        }
 
         /// <summary>
         /// Removes the specified override item
         /// </summary>
         /// <param name="item"></param>
-        public void RemoveRasterItem(RasterWmsItem item) { _rasterItems.Remove(item); }
+        public void RemoveRasterItem(RasterWmsItem item)
+        {
+            _rasterItems.Remove(item);
+        }
 
         /// <summary>
         /// Write this document's schema mappings to the given XML document
@@ -64,7 +72,7 @@
             //TODO: Is WMS multi-schema? We should factor this in
             map.SetAttribute("name", base._schemas[0].Name); //NOXLATE
             {
-                foreach(var ritem in _rasterItems)
+                foreach (var ritem in _rasterItems)
                 {
                     if (ritem.SchemaName != base._schemas[0].Name)
                         continue;
@@ -289,4 +297,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/WmsLayerDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/WmsLayerDefinition.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/WmsLayerDefinition.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 
 namespace OSGeo.MapGuide.MaestroAPI.SchemaOverrides
 {
@@ -32,13 +33,18 @@
         /// <summary>
         /// Initializes a new instance of the <see cref="WmsLayerDefinition"/> class.
         /// </summary>
-        public WmsLayerDefinition() { }
+        public WmsLayerDefinition()
+        {
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="WmsLayerDefinition"/> class.
         /// </summary>
         /// <param name="layerName">Name of the layer.</param>
-        public WmsLayerDefinition(string layerName) { this.Name = layerName; }
+        public WmsLayerDefinition(string layerName)
+        {
+            this.Name = layerName;
+        }
 
         /// <summary>
         /// Gets or sets the name.
@@ -104,4 +110,4 @@
             this.Name = n.Value;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/Enums.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/Enums.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/Enums.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,22 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 
 //This file contains a copy/conversion of some of the internal MapGuide Header files
@@ -24,241 +27,236 @@
 
 namespace OSGeo.MapGuide.MaestroAPI.Serialization
 {
-	internal enum MgPacketHeader 
-		: uint
-	{
-		Unknown                   =   0x1111FF01,
-		Operation                 =   0x1111FF02,
-		OperationResponse         =   0x1111FF03,
-		ArgumentSimple            =   0x1111FF04,
-		ArgumentCollection        =   0x1111FF05,
-		ArgumentBinaryStream      =   0x1111FF06,
-		Control                   =   0x1111FF07,
-		Error                     =   0x1111FF08,
-		END                       =   0x1111FF09
-	};
+    internal enum MgPacketHeader
+        : uint
+    {
+        Unknown = 0x1111FF01,
+        Operation = 0x1111FF02,
+        OperationResponse = 0x1111FF03,
+        ArgumentSimple = 0x1111FF04,
+        ArgumentCollection = 0x1111FF05,
+        ArgumentBinaryStream = 0x1111FF06,
+        Control = 0x1111FF07,
+        Error = 0x1111FF08,
+        END = 0x1111FF09
+    };
 
-	internal enum MgServiceID
-	{
-		Unknown           =   0x1111FE01,
-		Drawing           =   0x1111FE02,
-		Feature           =   0x1111FE03,
-		Mapping           =   0x1111FE04,
-		Rendering         =   0x1111FE05,
-		Resource          =   0x1111FE06,
-		ServerAdmin       =   0x1111FE07,
-		Site              =   0x1111FE08,
-		Tile              =   0x1111FE09,
-		Kml               =   0x1111FE0A, 
-		END               =   0x1111FE0B 
+    internal enum MgServiceID
+    {
+        Unknown = 0x1111FE01,
+        Drawing = 0x1111FE02,
+        Feature = 0x1111FE03,
+        Mapping = 0x1111FE04,
+        Rendering = 0x1111FE05,
+        Resource = 0x1111FE06,
+        ServerAdmin = 0x1111FE07,
+        Site = 0x1111FE08,
+        Tile = 0x1111FE09,
+        Kml = 0x1111FE0A,
+        END = 0x1111FE0B
+    };
 
-	};
+    internal enum MgECode
+    {
+        Success = 0x1111FD01,
+        SuccessWithWarning = 0x1111FD02,
+        Failure = 0x1111FD03
+    };
 
-	internal enum MgECode
-	{
-		Success            =   0x1111FD01,
-		SuccessWithWarning =   0x1111FD02,
-		Failure            =   0x1111FD03
-	};
+    internal enum MgArgumentType
+        : uint
+    {
+        Unknown = 0x1111FC01,
+        INT8 = 0x1111FC02,
+        UINT8 = 0x1111FC03,
+        INT16 = 0x1111FC04,
+        UINT16 = 0x1111FC05,
+        INT32 = 0x1111FC06,
+        UINT32 = 0x1111FC07,
+        INT64 = 0x1111FC08,
+        UINT64 = 0x1111FC09,
+        Float = 0x1111FC0A,
+        Double = 0x1111FC0B,
+        String = 0x1111FC0C,
+        Stream = 0x1111FC0D,
+        ClassId = 0x1111FC0E,
+        END = 0x1111FC0F
+    };
 
-	internal enum MgArgumentType 
-		: uint
-	{
-		Unknown          =   0x1111FC01,
-		INT8             =   0x1111FC02,
-		UINT8            =   0x1111FC03,
-		INT16            =   0x1111FC04,
-		UINT16           =   0x1111FC05,
-		INT32            =   0x1111FC06,
-		UINT32           =   0x1111FC07,
-		INT64            =   0x1111FC08,
-		UINT64           =   0x1111FC09,
-		Float            =   0x1111FC0A,
-		Double           =   0x1111FC0B,
-		String           =   0x1111FC0C,
-		Stream           =   0x1111FC0D,
-		ClassId          =   0x1111FC0E,
-		END              =   0x1111FC0F
-	};
+    internal enum MgControlID
+    {
+        Unknown = 0x1111FB01,
+        UserStop = 0x1111FB02,
+        ServerStop = 0x1111FB03,
+        Pause = 0x1111FB04,
+        Continue = 0x1111FB05,
+        Close = 0x1111FB06
+    };
 
-	internal enum MgControlID
-	{
-		Unknown       =   0x1111FB01,
-		UserStop      =   0x1111FB02,
-		ServerStop    =   0x1111FB03,
-		Pause         =   0x1111FB04,
-		Continue      =   0x1111FB05,
-		Close         =   0x1111FB06
-	};
+    internal enum MgStreamContentType
+    {
+        Unknown = 0x1111FA00
+    };
 
-	internal enum MgStreamContentType
-	{
-		Unknown = 0x1111FA00
-	};
+    internal enum UserInformationType
+    {
+        None = 0,
+        Mg,
+        MgSession,
+    };
 
-	internal enum UserInformationType
-	{
-		None = 0, 
-		Mg,  
-		MgSession,
-	};
+    internal enum MgStreamHeaderValues
+    {
+        StreamStart = 0x1111F801,
+        StreamData = 0x1111F802,
+        StreamEnd = 0x1111F803
+    };
 
-	internal enum MgStreamHeaderValues
-	{
-		StreamStart   =   0x1111F801,
-		StreamData    =   0x1111F802,
-		StreamEnd     =   0x1111F803
-	};
+    internal abstract class MgBasicPacket
+    {
+        public MgPacketHeader PacketHeader;
 
-	internal abstract class MgBasicPacket
-	{
-		public MgPacketHeader PacketHeader;
+        public MgBasicPacket()
+        {
+        }
 
-		public MgBasicPacket()
-		{
-		}
+        public MgBasicPacket(MgPacketHeader header)
+        {
+            PacketHeader = header;
+        }
+    };
 
-		public MgBasicPacket(MgPacketHeader header)
-		{
-			PacketHeader = header;
-		}
-	};
+    internal class MgArgumentPacket
+        : MgBasicPacket
+    {
+        public MgArgumentType ArgumentType;
+        public object Data;
+        public UInt64 Length;
 
-	internal class MgArgumentPacket
-		: MgBasicPacket
-	{
-		public MgArgumentType ArgumentType;
-		public object Data;
-		public UInt64 Length;
+        public MgArgumentPacket()
+        {
+        }
 
-		public MgArgumentPacket()
-		{
-		}
+        public MgArgumentPacket(MgPacketHeader header, MgArgumentType type, object data, UInt64 length)
+            : base(header)
+        {
+            ArgumentType = type;
+            Data = data;
+            Length = length;
+        }
+    }
 
-		public MgArgumentPacket(MgPacketHeader header, MgArgumentType type, object data, UInt64 length)
-			: base(header)
-		{
-			ArgumentType = type;
-			Data = data;
-			Length = length;
-		}
-	}
+    internal class MgBinaryStreamArgumentPacket
+        : MgArgumentPacket
+    {
+        public UInt32 Version;
+        public const System.UInt32 MG_STREAM_VERSION = 1;
 
-	internal class MgBinaryStreamArgumentPacket
-		: MgArgumentPacket
-	{
-		public UInt32 Version;
-		public const System.UInt32 MG_STREAM_VERSION = 1;
+        public MgBinaryStreamArgumentPacket()
+        {
+        }
 
-		public MgBinaryStreamArgumentPacket()
-		{
-		}
+        public MgBinaryStreamArgumentPacket(MgPacketHeader header, MgArgumentType type, object data, UInt64 length, UInt32 version)
+            : base(header, type, data, length)
+        {
+            Version = version;
+        }
+    }
 
-		public MgBinaryStreamArgumentPacket(MgPacketHeader header, MgArgumentType type, object data, UInt64 length, UInt32 version)
-			: base(header, type, data, length)
-		{
-			Version = version;
-		}
-	}
+    internal class MgStreamHeader
+    {
+        public MgStreamHeaderValues StreamStart;
+        public UInt32 StreamVersion;
+        public MgStreamHeaderValues StreamDataHdr;
 
-	internal class MgStreamHeader
-	{
-		public MgStreamHeaderValues StreamStart;
-		public UInt32 StreamVersion;
-		public MgStreamHeaderValues StreamDataHdr;
+        public const UInt32 CurrentStreamVersion = (3 << 16) + 0;
 
-		public const UInt32 CurrentStreamVersion = (3<<16) + 0;
+        public MgStreamHeader()
+        {
+        }
 
-		public MgStreamHeader()
-		{
-		}
+        public MgStreamHeader(MgStreamHeaderValues streamStart, UInt32 streamVersion, MgStreamHeaderValues streamDataHdr)
+        {
+            StreamStart = streamStart;
+            StreamVersion = streamVersion;
+            StreamDataHdr = streamDataHdr;
+        }
+    }
 
-		public MgStreamHeader(MgStreamHeaderValues streamStart, UInt32 streamVersion, MgStreamHeaderValues streamDataHdr)
-		{
-			StreamStart = streamStart;
-			StreamVersion = streamVersion;
-			StreamDataHdr = streamDataHdr;
-		}
-	}
+    internal class MgOperationPacket
+        : MgBasicPacket
+    {
+        public UInt32 PacketVersion;
+        public UInt32 ServiceID;
+        public UInt32 OperationID;
+        public UInt32 OperationVersion;
+        public UInt32 NumArguments;
+        public MgUserInformation UserInfo;
 
-	internal class MgOperationPacket
-		: MgBasicPacket
-	{
-		public UInt32 PacketVersion;
-		public UInt32 ServiceID;
-		public UInt32 OperationID;
-		public UInt32 OperationVersion;
-		public UInt32 NumArguments;
-		public MgUserInformation UserInfo;
+        public MgOperationPacket()
+        {
+        }
 
-		public MgOperationPacket()
-		{
-		}
+        public MgOperationPacket(MgPacketHeader header, UInt32 packetVersion, UInt32 serviceID, UInt32 operationID, UInt32 operationVersion, UInt32 numArguments, MgUserInformation userInfo)
+            : base(header)
+        {
+            PacketVersion = packetVersion;
+            ServiceID = serviceID;
+            OperationID = operationID;
+            OperationVersion = operationVersion;
+            NumArguments = numArguments;
+            UserInfo = userInfo;
+        }
+    }
 
-		public MgOperationPacket(MgPacketHeader header, UInt32 packetVersion, UInt32 serviceID, UInt32 operationID, UInt32 operationVersion, UInt32 numArguments, MgUserInformation userInfo)
-			: base(header)
-		{
-			PacketVersion = packetVersion;
-			ServiceID = serviceID;
-			OperationID = operationID;
-			OperationVersion = operationVersion;
-			NumArguments = numArguments;
-			UserInfo = userInfo;
-		}
+    internal class MgUserInformation
+    {
+        /*private static UInt32 m_cls_id = 30606;
+        private string m_username;
+        private string m_password;
+        private string m_sessionId;
+        private string m_locale;
+        private UserInformationType m_type;
 
-	}
+        private string m_clientAgent;
+        private string m_clientIp;*/
+    }
 
-	internal class MgUserInformation
-	{
-		/*private static UInt32 m_cls_id = 30606;
-		private string m_username;
-		private string m_password;
-		private string m_sessionId;
-		private string m_locale;
-		private UserInformationType m_type;
+    internal class MgOperationResponsePacket
+        : MgBasicPacket
+    {
+        public UInt32 PacketVersion;
+        public MgECode ECode;
+        public UInt32 NumReturnValues;
 
-		private string m_clientAgent;
-		private string m_clientIp;*/
-	}
+        public MgOperationResponsePacket()
+        {
+        }
 
-	internal class MgOperationResponsePacket
-		: MgBasicPacket
-	{
-		public UInt32 PacketVersion;
-		public MgECode ECode;
-		public UInt32 NumReturnValues;
+        public MgOperationResponsePacket(MgPacketHeader header, UInt32 packetVersion, MgECode eCode, UInt32 numReturnValues)
+            : base(header)
+        {
+            PacketVersion = packetVersion;
+            ECode = eCode;
+            NumReturnValues = numReturnValues;
+        }
+    }
 
-		public MgOperationResponsePacket() 
-		{
-		}
+    internal class MgControlPacket
+        : MgBasicPacket
+    {
+        public UInt32 PacketVersion;
+        public UInt32 ControlID;
 
-		public MgOperationResponsePacket(MgPacketHeader header, UInt32 packetVersion, MgECode eCode, UInt32 numReturnValues)
-			: base(header)
-		{
-			PacketVersion = packetVersion;
-			ECode = eCode;
-			NumReturnValues = numReturnValues ;
-		}
+        public MgControlPacket()
+        {
+        }
 
-	}
-
-	internal class MgControlPacket
-		: MgBasicPacket
-	{
-		public UInt32 PacketVersion;
-		public UInt32 ControlID;
-
-		public MgControlPacket() 
-		{
-		}
-
-		public MgControlPacket(MgPacketHeader header, UInt32 packetVersion, UInt32 controlID)
-			: base(header)
-		{
-			PacketVersion = packetVersion;
-			ControlID = controlID;
-		}
-	}
-
-
-}
+        public MgControlPacket(MgPacketHeader header, UInt32 packetVersion, UInt32 controlID)
+            : base(header)
+        {
+            PacketVersion = packetVersion;
+            ControlID = controlID;
+        }
+    }
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/IBinarySerializable.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/IBinarySerializable.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/IBinarySerializable.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,40 +1,42 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
-using System;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Serialization
 {
-	/// <summary>
-	/// An object that can be serialized, using the internal MapGuide format, must implement this interface
-	/// </summary>
-	public interface IBinarySerializable
-	{
+    /// <summary>
+    /// An object that can be serialized, using the internal MapGuide format, must implement this interface
+    /// </summary>
+    public interface IBinarySerializable
+    {
         /// <summary>
         /// Serializes using the specified serializer.
         /// </summary>
         /// <param name="serializer">The serializer.</param>
-		void Serialize(MgBinarySerializer serializer);
+        void Serialize(MgBinarySerializer serializer);
+
         /// <summary>
         /// Deserializes using the specified deserializer.
         /// </summary>
         /// <param name="deserializer">The deserializer.</param>
-		void Deserialize(MgBinaryDeserializer deserializer);
-	}
-}
+        void Deserialize(MgBinaryDeserializer deserializer);
+    }
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/MgBinaryDeserializer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/MgBinaryDeserializer.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/MgBinaryDeserializer.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,22 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.IO;
 
@@ -47,7 +50,7 @@
             m_stream = stream;
             m_siteVersion = siteversion;
         }
-        
+
         /*
         private MgStreamHeader ReadStreamHeader()
         {
@@ -99,9 +102,8 @@
 
                 string b = System.Text.Encoding.UTF8.GetString(buf);
                 //Chop of C zero terminator... Why store it, when the length is also present?
-                return b.Substring(0, b.Length - 1); 
+                return b.Substring(0, b.Length - 1);
             }
-            
         }
 
         /// <summary>
@@ -112,14 +114,16 @@
         {
             int charwidth = m_stream.ReadByte();
             System.Text.Encoding ec;
-            switch(charwidth)
+            switch (charwidth)
             {
                 case 1:
                     ec = System.Text.Encoding.UTF8;
                     break;
+
                 case 2:
                     ec = System.Text.Encoding.GetEncoding("UTF-16"); //NOXLATE
                     break;
+
                 default:
                     throw new Exception(Strings.ErrorBinarySerializerGetCharWidth);
             }
@@ -259,7 +263,7 @@
                 throw new Exception(string.Format(Strings.ErrorBinarySerializerInvalidCoordinateDimensionCount, dimensions));
 
             double[] args = new double[dimensions * count];
-            for(int i = 0;i < (dimensions * count); i++)
+            for (int i = 0; i < (dimensions * count); i++)
                 args[i] = ReadDouble();
 
             return args;
@@ -282,7 +286,7 @@
             //Due to the annoying embedded buffer size markers, we cannot return the stream 'as is' Grrrrrr!
 
             int r;
-            ulong remain = p.Length; 
+            ulong remain = p.Length;
             byte[] buf = new byte[1024 * 8];
 
             MemoryStream ms = new MemoryStream();
@@ -291,7 +295,7 @@
                 int blocksize = ReadInt32();
                 r = 1;
 
-                while( r > 0 && blocksize > 0)
+                while (r > 0 && blocksize > 0)
                 {
                     r = m_stream.Read(buf, 0, (int)Math.Min((ulong)remain, (ulong)buf.Length));
                     blocksize -= r;
@@ -301,7 +305,6 @@
 
                 if (blocksize != 0)
                     throw new Exception(Strings.ErrorBinarySerializerPrematureEndOfStream);
-
             } while (remain > 0);
 
             ms.Position = 0;
@@ -342,10 +345,11 @@
                 return null;
 
             IBinarySerializable obj = null;
-            switch(classId)
+            switch (classId)
             {
                 case 0:
                     break;
+
                 default:
                     throw new Exception(string.Format(Strings.ErrorBinarySerializerUnknownObjectType, classId));
             }
@@ -376,7 +380,7 @@
         {
             int r;
             int _offset = 0;
-            
+
             if (buf.Length < len + offset)
                 throw new OverflowException(Strings.ErrorBinarySerializerBufferTooSmall);
 
@@ -397,8 +401,8 @@
         /// <returns>The internal buffer object</returns>
         private byte[] ReadStream(int len)
         {
-            ReadStreamRepeat(m_buf, 0, len); 
+            ReadStreamRepeat(m_buf, 0, len);
             return m_buf;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/MgBinarySerializer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/MgBinarySerializer.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/MgBinarySerializer.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,22 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.IO;
 
@@ -30,31 +33,35 @@
         private Stream m_stream;
         private Version m_siteVersion;
 
-
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public static int UInt16Len = BitConverter.GetBytes((UInt16)0).Length;
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public static int UInt32Len = BitConverter.GetBytes((UInt32)0).Length;
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public static int UInt64Len = BitConverter.GetBytes((UInt64)0).Length;
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
-        public static int FloatLen =  BitConverter.GetBytes((float)0).Length;
+        public static int FloatLen = BitConverter.GetBytes((float)0).Length;
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
-        public static int DoubleLen =  BitConverter.GetBytes((double)0).Length;
+        public static int DoubleLen = BitConverter.GetBytes((double)0).Length;
+
         /// <summary>
-        /// 
+        ///
         /// </summary>
-        public static int UInt8Len =  1; //a byte...
+        public static int UInt8Len = 1; //a byte...
 
         /// <summary>
         /// Gets the site version.
@@ -96,7 +103,7 @@
             Write(coordinates.Length / ndim);
             Write(dimensions);
 
-            for(int i = 0;i < coordinates.Length; i++)
+            for (int i = 0; i < coordinates.Length; i++)
                 Write(coordinates[i]);
         }
 
@@ -116,7 +123,6 @@
                 Write(resourceID);
         }
 
-
         /// <summary>
         /// Writes the specified value.
         /// </summary>
@@ -251,7 +257,6 @@
                 value.Serialize(this);
         }
 
-
         /// <summary>
         /// Writes the specified value.
         /// </summary>
@@ -270,7 +275,7 @@
         /// <param name="stream">The stream.</param>
         public void Write(Stream stream)
         {
-            Write(new MgBinaryStreamArgumentPacket(MgPacketHeader.ArgumentSimple, MgArgumentType.INT8, null, (ulong)(stream == null ? 0 : stream.Length), MgBinaryStreamArgumentPacket.MG_STREAM_VERSION ));
+            Write(new MgBinaryStreamArgumentPacket(MgPacketHeader.ArgumentSimple, MgArgumentType.INT8, null, (ulong)(stream == null ? 0 : stream.Length), MgBinaryStreamArgumentPacket.MG_STREAM_VERSION));
             Write(stream == null);
             if (stream != null)
             {
@@ -354,6 +359,7 @@
             WriteStreamEnd();
         }
         */
+
         /// <summary>
         /// Writes the raw.
         /// </summary>
@@ -362,6 +368,5 @@
         {
             m_stream.Write(buf, 0, buf.Length);
         }
-
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Serialization/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,35 +1,35 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace OSGeo.MapGuide.MaestroAPI.Serialization
 {
     /// <summary>
-    /// The <c>OSGeo.MapGuide.MaestroAPI.Serialization</c> namespace provides classes and interfaces for working with 
+    /// The <c>OSGeo.MapGuide.MaestroAPI.Serialization</c> namespace provides classes and interfaces for working with
     /// internal MapGuide binary streams.
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IDrawingService.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IDrawingService.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IDrawingService.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.Common;
 
 namespace OSGeo.MapGuide.MaestroAPI.Services
 {
     /// <summary>
-    /// Allows low level access to DWF (Design Web Format) data stored in a resource repository as part of a drawing source. 
+    /// Allows low level access to DWF (Design Web Format) data stored in a resource repository as part of a drawing source.
     /// </summary>
     /// <example>
     /// This example shows how to obtain a drawing service instance. Note that you should check if this service type is
@@ -41,14 +41,14 @@
     public interface IDrawingService : IService
     {
         /// <summary>
-        /// Gets the manifest.xml document which describes the supported document interfaces, the document properties, the sections and their contents, and section dependencies. 
+        /// Gets the manifest.xml document which describes the supported document interfaces, the document properties, the sections and their contents, and section dependencies.
         /// </summary>
         /// <param name="resourceID"></param>
         /// <returns></returns>
         System.IO.Stream DescribeDrawing(string resourceID);
 
         /// <summary>
-        /// Gets the names of the layers in a DWF section. 
+        /// Gets the names of the layers in a DWF section.
         /// </summary>
         /// <param name="resourceID"></param>
         /// <param name="sectionName"></param>
@@ -56,7 +56,7 @@
         string[] EnumerateDrawingLayers(string resourceID, string sectionName);
 
         /// <summary>
-        /// Enumerates the resources of a DWF section (sometimes called a sheet). 
+        /// Enumerates the resources of a DWF section (sometimes called a sheet).
         /// </summary>
         /// <param name="resourceID"></param>
         /// <param name="sectionName"></param>
@@ -64,28 +64,28 @@
         DrawingSectionResourceList EnumerateDrawingSectionResources(string resourceID, string sectionName);
 
         /// <summary>
-        /// Enumerates only the ePlot  sections (sheets) in a DWF. 
+        /// Enumerates only the ePlot  sections (sheets) in a DWF.
         /// </summary>
         /// <param name="resourceID"></param>
         /// <returns></returns>
         DrawingSectionList EnumerateDrawingSections(string resourceID);
 
         /// <summary>
-        /// Gets the coordinate system assigned to the DWF drawing. 
+        /// Gets the coordinate system assigned to the DWF drawing.
         /// </summary>
         /// <param name="resourceID"></param>
         /// <returns></returns>
         string GetDrawingCoordinateSpace(string resourceID);
 
         /// <summary>
-        /// Returns the DWF stream for a drawing specified by resource identifier. 
+        /// Returns the DWF stream for a drawing specified by resource identifier.
         /// </summary>
         /// <param name="resourceID"></param>
         /// <returns></returns>
         System.IO.Stream GetDrawing(string resourceID);
 
         /// <summary>
-        /// Gets a layer from a particular section of a DWF. 
+        /// Gets a layer from a particular section of a DWF.
         /// </summary>
         /// <param name="resourceID"></param>
         /// <param name="sectionName"></param>
@@ -94,7 +94,7 @@
         System.IO.Stream GetLayer(string resourceID, string sectionName, string layerName);
 
         /// <summary>
-        /// Gets a DWF containing only the requested section (sometimes called a sheet). 
+        /// Gets a DWF containing only the requested section (sometimes called a sheet).
         /// </summary>
         /// <param name="resourceID"></param>
         /// <param name="sectionName"></param>
@@ -102,11 +102,11 @@
         System.IO.Stream GetSection(string resourceID, string sectionName);
 
         /// <summary>
-        /// Gets a specific resource from the DWF. 
+        /// Gets a specific resource from the DWF.
         /// </summary>
         /// <param name="resourceID"></param>
         /// <param name="resourceName"></param>
         /// <returns></returns>
         System.IO.Stream GetSectionResource(string resourceID, string resourceName);
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IFeatureService.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IFeatureService.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IFeatureService.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Collections.Specialized;
-using ObjCommon = OSGeo.MapGuide.ObjectModels.Common;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Feature;
 using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.MaestroAPI.Feature;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
 using OSGeo.MapGuide.ObjectModels.Common;
+using System.Collections.Specialized;
 
+using ObjCommon = OSGeo.MapGuide.ObjectModels.Common;
+
 namespace OSGeo.MapGuide.MaestroAPI.Services
 {
     /// <summary>
@@ -217,7 +217,7 @@
         /// <param name="resourceID">The Feature Source ID</param>
         /// <remarks>
         /// If you only need to list schemas and class names, use the respective <see cref="M:OSGeo.MapGuide.MaestroAPI.Services.IFeatureService.GetSchemas" /> and
-        /// <see cref="M:OSGeo.MapGuide.MaestroAPI.Services.IFeatureService.GetClassNames" /> methods. Using this API will have a noticeable performance impact on 
+        /// <see cref="M:OSGeo.MapGuide.MaestroAPI.Services.IFeatureService.GetClassNames" /> methods. Using this API will have a noticeable performance impact on
         /// really large datastores (whose size is in the 100s of classes).
         /// </remarks>
         /// <returns></returns>
@@ -230,7 +230,7 @@
         /// <param name="schema">The name of the schema to describe</param>
         /// <remarks>
         /// If you only need to list schemas and class names, use the respective <see cref="M:OSGeo.MapGuide.MaestroAPI.Services.IFeatureService.GetSchemas" /> and
-        /// <see cref="M:OSGeo.MapGuide.MaestroAPI.Services.IFeatureService.GetClassNames" /> methods. Using this API will have a noticeable performance impact on 
+        /// <see cref="M:OSGeo.MapGuide.MaestroAPI.Services.IFeatureService.GetClassNames" /> methods. Using this API will have a noticeable performance impact on
         /// really large datastores (whose size is in the 100s of classes).
         /// </remarks>
         /// <returns></returns>
@@ -244,11 +244,11 @@
         /// <param name="classNames">The array of class names to include in the resulting schema</param>
         /// <remarks>
         /// If you only need to list schemas and class names, use the respective <see cref="M:OSGeo.MapGuide.MaestroAPI.Services.IFeatureService.GetSchemas" /> and
-        /// <see cref="M:OSGeo.MapGuide.MaestroAPI.Services.IFeatureService.GetClassNames" /> methods. Using this API will have a noticeable performance impact on 
+        /// <see cref="M:OSGeo.MapGuide.MaestroAPI.Services.IFeatureService.GetClassNames" /> methods. Using this API will have a noticeable performance impact on
         /// really large datastores (whose size is in the 100s of classes).
         /// </remarks>
         /// <returns></returns>
-        FeatureSchema DescribeFeatureSourcePartial(string resourceID, string schema, string [] classNames);
+        FeatureSchema DescribeFeatureSourcePartial(string resourceID, string schema, string[] classNames);
 
         /// <summary>
         /// Gets the specified class definition
@@ -317,4 +317,4 @@
         /// <returns></returns>
         ConfigurationDocument GetSchemaMapping(string provider, string partialConnString);
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IFusionService.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IFusionService.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IFusionService.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 
 namespace OSGeo.MapGuide.MaestroAPI.Services
@@ -58,4 +58,4 @@
         /// <returns>The avalible widget containers on the server</returns>
         IApplicationDefinitionContainerInfoSet GetApplicationContainers();
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IMappingService.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IMappingService.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IMappingService.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Mapping;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.MaestroAPI.Mapping;
 using System.Drawing;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 
 namespace OSGeo.MapGuide.MaestroAPI.Services
 {
@@ -124,8 +125,8 @@
         /// <remarks>
         /// Calculation of meters-per-unit may differ between implementations. This may have an adverse
         /// effect on things such as rendering and measuring depending on the underlying implementation
-        /// 
-        /// If you are certain of the meters-per-unit value required, use the overloaded method that 
+        ///
+        /// If you are certain of the meters-per-unit value required, use the overloaded method that
         /// accepts a metersPerUnit parameter.
         /// </remarks>
         /// <example>
@@ -150,8 +151,8 @@
         /// <remarks>
         /// Calculation of meters-per-unit may differ between implementations. This may have an adverse
         /// effect on things such as rendering and measuring depending on the underlying implementation
-        /// 
-        /// If you are certain of the meters-per-unit value required, use the overloaded method that 
+        ///
+        /// If you are certain of the meters-per-unit value required, use the overloaded method that
         /// accepts a metersPerUnit parameter.
         /// </remarks>
         /// <example>
@@ -225,8 +226,8 @@
         /// <remarks>
         /// Calculation of meters-per-unit may differ between implementations. This may have an adverse
         /// effect on things such as rendering and measuring depending on the underlying implementation
-        /// 
-        /// If you are certain of the meters-per-unit value required, use the overloaded method that 
+        ///
+        /// If you are certain of the meters-per-unit value required, use the overloaded method that
         /// accepts a metersPerUnit parameter.
         /// </remarks>
         /// <example>
@@ -255,8 +256,8 @@
         /// <remarks>
         /// Calculation of meters-per-unit may differ between implementations. This may have an adverse
         /// effect on things such as rendering and measuring depending on the underlying implementation
-        /// 
-        /// If you are certain of the meters-per-unit value required, use the overloaded method that 
+        ///
+        /// If you are certain of the meters-per-unit value required, use the overloaded method that
         /// accepts a metersPerUnit parameter.
         /// </remarks>
         /// <example>
@@ -337,8 +338,8 @@
         /// <remarks>
         /// Calculation of meters-per-unit may differ between implementations. This may have an adverse
         /// effect on things such as rendering and measuring depending on the underlying implementation
-        /// 
-        /// If you are certain of the meters-per-unit value required, use the overloaded method that 
+        ///
+        /// If you are certain of the meters-per-unit value required, use the overloaded method that
         /// accepts a metersPerUnit parameter.
         /// </remarks>
         /// <example>
@@ -367,8 +368,8 @@
         /// <remarks>
         /// Calculation of meters-per-unit may differ between implementations. This may have an adverse
         /// effect on things such as rendering and measuring depending on the underlying implementation
-        /// 
-        /// If you are certain of the meters-per-unit value required, use the overloaded method that 
+        ///
+        /// If you are certain of the meters-per-unit value required, use the overloaded method that
         /// accepts a metersPerUnit parameter.
         /// </remarks>
         /// <example>
@@ -517,7 +518,7 @@
         /// <returns></returns>
         /// <exception cref="T:System.NotSupportedException">Thrown if the service is too old to be able to support this API</exception>
         System.IO.Stream RenderDynamicOverlay(RuntimeMap map, MapSelection selection, string format, Color selectionColor, int behaviour);
-        
+
         /// <summary>
         /// Renders the runtime map.
         /// </summary>
@@ -530,6 +531,7 @@
         /// <param name="dpi">The dpi.</param>
         /// <returns></returns>
         System.IO.Stream RenderRuntimeMap(RuntimeMap map, double x, double y, double scale, int width, int height, int dpi);
+
         /// <summary>
         /// Renders the runtime map.
         /// </summary>
@@ -557,6 +559,7 @@
         /// <param name="format">The format.</param>
         /// <returns></returns>
         System.IO.Stream RenderRuntimeMap(RuntimeMap map, double x, double y, double scale, int width, int height, int dpi, string format);
+
         /// <summary>
         /// Renders the runtime map.
         /// </summary>
@@ -586,6 +589,7 @@
         /// <param name="clip">if set to <c>true</c> [clip].</param>
         /// <returns></returns>
         System.IO.Stream RenderRuntimeMap(RuntimeMap map, double x, double y, double scale, int width, int height, int dpi, string format, bool clip);
+
         /// <summary>
         /// Renders the runtime map.
         /// </summary>
@@ -637,8 +641,8 @@
         System.Drawing.Image GetLegendImage(double scale, string layerdefinition, int themeIndex, int type, int width, int height, string format);
 
         /// <summary>
-        /// Identifies features that meet the specified spatial selection criteria. These features can be persisted as selected features in a map. 
-        /// This operation is generally used to implement selection/tooltip functionality for a client-side map viewer. 
+        /// Identifies features that meet the specified spatial selection criteria. These features can be persisted as selected features in a map.
+        /// This operation is generally used to implement selection/tooltip functionality for a client-side map viewer.
         /// QueryMapFeatures returns an XML document describing the set of selected features.
         /// If a single feature is selected, the XML contains the tooltip, hyperlink, and properties of the feature.
         /// </summary>
@@ -651,4 +655,4 @@
         /// <returns></returns>
         string QueryMapFeatures(RuntimeMap map, int maxFeatures, string wkt, bool persist, string selectionVariant, QueryMapOptions extraOptions);
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IResourceService.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IResourceService.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IResourceService.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
-using ObjCommon = OSGeo.MapGuide.ObjectModels.Common;
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.IO;
+using ObjCommon = OSGeo.MapGuide.ObjectModels.Common;
 
 namespace OSGeo.MapGuide.MaestroAPI.Services
 {
@@ -41,6 +40,7 @@
         /// Raised when a resource is added
         /// </summary>
         event ResourceEventHandler ResourceAdded;
+
         /// <summary>
         /// Raised when a resource is deleted. Note if a folder is deleted, this will
         /// only be raised for the folder and not its children. Also note that this is
@@ -48,6 +48,7 @@
         /// purposes, deleted.
         /// </summary>
         event ResourceEventHandler ResourceDeleted;
+
         /// <summary>
         /// Raised when a resource is updated
         /// </summary>
@@ -115,7 +116,7 @@
         /// <param name="data"></param>
         /// <returns></returns>
         T DeserializeObject<T>(System.IO.Stream data);
-        
+
         /// <summary>
         /// Serializes the specified object to the specified stream
         /// </summary>
@@ -144,7 +145,7 @@
         /// <param name="resourceID"></param>
         /// <returns></returns>
         ObjCommon.ResourceFolderHeaderType GetFolderHeader(string resourceID);
-        
+
         /// <summary>
         /// Gets the raw XML stream of the specified resource id
         /// </summary>
@@ -160,7 +161,7 @@
         IResource GetResource(string resourceID);
 
         /// <summary>
-        /// Forces a timestamp update of the specified resource. This is akin to 
+        /// Forces a timestamp update of the specified resource. This is akin to
         /// setting the resource's content using its existing content.
         /// </summary>
         /// <param name="resourceID"></param>
@@ -175,7 +176,7 @@
         /// <param name="datatype"></param>
         /// <param name="stream"></param>
         void SetResourceData(string resourceid, string dataname, ObjCommon.ResourceDataType datatype, System.IO.Stream stream);
-        
+
         /// <summary>
         /// Sets the resource data of a specified resource
         /// </summary>
@@ -200,7 +201,7 @@
         /// <param name="resourceID"></param>
         /// <param name="header"></param>
         void SetFolderHeader(string resourceID, ObjCommon.ResourceFolderHeaderType header);
-        
+
         /// <summary>
         /// Sets the header for the specified resource
         /// </summary>
@@ -257,7 +258,7 @@
         /// <param name="newResourceID"></param>
         /// <param name="overwrite"></param>
         void MoveResource(string oldResourceID, string newResourceID, bool overwrite);
-        
+
         /// <summary>
         /// Moves the specified resources to the specified path. Any resources referencing this resource
         /// are updated to reference the resource's new location
@@ -268,9 +269,9 @@
         /// <param name="progress"></param>
         /// <returns></returns>
         bool MoveResourceWithReferences(string oldResourceID, string newResourceID, LengthyOperationCallBack callback, LengthyOperationProgressCallBack progress);
-        
+
         /// <summary>
-        /// Copies the specified folder to the specified path. Any resources referencing this folder 
+        /// Copies the specified folder to the specified path. Any resources referencing this folder
         /// are updated to reference the resources's new location
         /// </summary>
         /// <param name="oldResourceID"></param>
@@ -286,12 +287,13 @@
         /// <param name="resourceID"></param>
         /// <returns></returns>
         bool ResourceExists(string resourceID);
-        
+
         /// <summary>
         /// Saves an object into the repository
         /// </summary>
         /// <param name="resource"></param>
         void SaveResource(IResource resource);
+
         /// <summary>
         /// Saves an object into the repository using the specified resource id.
         /// </summary>
@@ -321,4 +323,4 @@
         /// <param name="callback">A callback argument used to display progress. May be null.</param>
         void UploadPackage(string fileName, Utility.StreamCopyProgressDelegate callback);
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IService.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IService.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IService.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Services
 {
     /// <summary>
@@ -28,6 +27,5 @@
     /// </summary>
     public interface IService
     {
-        
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/ISiteService.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/ISiteService.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/ISiteService.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.ObjectModels.Common;
 
 namespace OSGeo.MapGuide.MaestroAPI.Services
@@ -65,4 +65,4 @@
         /// <returns></returns>
         SiteInformation GetSiteInfo();
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/ITileService.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/ITileService.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/ITileService.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Services
 {
     /// <summary>
@@ -51,4 +50,4 @@
         /// <returns>An image stream</returns>
         System.IO.Stream GetTile(string mapDefinition, string baseLayerGroup, int column, int row, int scaleIndex, string format);
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/NsDoc.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/NsDoc.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/NsDoc.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,38 +1,38 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using System.Runtime.CompilerServices;
 
 namespace OSGeo.MapGuide.MaestroAPI.Services
 {
     /// <summary>
-    /// The <c>OSGeo.MapGuide.MaestroAPI.Services</c> namespace defines the core MapGuide Service APIs as 
+    /// The <c>OSGeo.MapGuide.MaestroAPI.Services</c> namespace defines the core MapGuide Service APIs as
     /// interfaces. All implementations of <see cref="T:OSGeo.MapGuide.MaestroAPI.IServerConnection"/> are
     /// guaranteed to implement at least the <see cref="T:OSGeo.MapGuide.MaestroAPI.IFeatureService"/> and
     /// <see cref="T:OSGeo.MapGuide.MaestroAPI.IResourceService"/> interfaces. You can use the connection
     /// capabilities to determine if additional service interfaces are implemented.
     /// </summary>
     [CompilerGenerated]
-    class NamespaceDoc
+    internal class NamespaceDoc
     {
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/QueryMapOptions.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/QueryMapOptions.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/QueryMapOptions.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Services
 {
     /// <summary>
@@ -44,8 +42,8 @@
         public QueryMapFeaturesLayerAttributes LayerAttributeFilter { get; set; }
 
         /// <summary>
-        /// XML filter describing a set of previously selected features. This paramter is useful for obtaining the attribute values of a previously selected feature. 
+        /// XML filter describing a set of previously selected features. This paramter is useful for obtaining the attribute values of a previously selected feature.
         /// </summary>
         public string FeatureFilter { get; set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/ServiceType.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/ServiceType.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/ServiceType.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI.Services
 {
     /// <summary>
@@ -32,29 +31,35 @@
         /// Features Service
         /// </summary>
         Feature,
+
         /// <summary>
         /// Resource Service
         /// </summary>
         Resource,
+
         /// <summary>
         /// Drawing Service
         /// </summary>
         Drawing,
+
         /// <summary>
         /// Mapping Service
         /// </summary>
         Mapping,
+
         /// <summary>
         /// Tile Service
         /// </summary>
         Tile,
+
         /// <summary>
         /// Fusion Service
         /// </summary>
         Fusion,
+
         /// <summary>
         /// Site Service
         /// </summary>
         Site
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SiteVersion.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SiteVersion.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SiteVersion.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,135 +1,160 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using System;
 
 namespace OSGeo.MapGuide.MaestroAPI
 {
-	///<summary>
-	/// This file contains the current known versions of the MapGuide server.
-	///</summary>
-	public enum KnownSiteVersions
-	{
+    ///<summary>
+    /// This file contains the current known versions of the MapGuide server.
+    ///</summary>
+    public enum KnownSiteVersions
+    {
         /// <summary>
         /// MapGuide Enterprise 2007
         /// </summary>
-		MapGuideEP1_1,              
+        MapGuideEP1_1,
+
         /// <summary>
         /// MapGuide Open Source 1.1.0
         /// </summary>
-		MapGuideOS1_1,              
+        MapGuideOS1_1,
+
         /// <summary>
         /// MapGuide Open Source 1.2.0
         /// </summary>
-		MapGuideOS1_2,              
+        MapGuideOS1_2,
+
         /// <summary>
         /// MapGuide Enterprise 2008
         /// </summary>
-		MapGuideEP1_2,              
+        MapGuideEP1_2,
+
         /// <summary>
         /// MapGuide Open Source 2.0.0 beta 1
         /// </summary>
-		MapGuideOS2_0B1,            
+        MapGuideOS2_0B1,
+
         /// <summary>
         /// MapGuide Open Source 2.0.0
         /// </summary>
-		MapGuideOS2_0,              
+        MapGuideOS2_0,
+
         /// <summary>
         /// MapGuide Enterprise 2009
         /// </summary>
-		MapGuideEP2009,             
+        MapGuideEP2009,
+
         /// <summary>
         /// MapGuide Open Source 2.0.2
         /// </summary>
-        MapGuideOS2_0_2,            
+        MapGuideOS2_0_2,
+
         /// <summary>
         /// MapGuide Enterprise 2009 SP1
         /// </summary>
-        MapGuideEP2009_SP1,         
+        MapGuideEP2009_SP1,
+
         /// <summary>
         /// MapGuide Enterprise 2010
         /// </summary>
-        MapGuideEP2010,             
+        MapGuideEP2010,
+
         /// <summary>
         /// MapGuide Enterprise 2010 Update 1
         /// </summary>
-        MapGuideEP2010_SP1,         
+        MapGuideEP2010_SP1,
+
         /// <summary>
         /// MapGuide Enterprise 2010 Update 1b
         /// </summary>
-        MapGuideEP2010_SP1b,        
+        MapGuideEP2010_SP1b,
+
         /// <summary>
         /// MapGuide Open Source 2.1.0
         /// </summary>
-        MapGuideOS2_1, 
+        MapGuideOS2_1,
+
         /// <summary>
         /// MapGuide Enterprise 2011
         /// </summary>
         MapGuideEP2011,
+
         /// <summary>
         /// MapGuide Enterprise 2011 Update 1
         /// </summary>
         MapGuideEP2011_SP1,
+
         /// <summary>
         /// MapGuide Open Source 2.2.0
         /// </summary>
         MapGuideOS2_2,
+
         /// <summary>
         /// Autodesk Infrastructure Map Server 2012
         /// </summary>
         MapGuideEP2012,
+
         /// <summary>
         /// MapGuide Open Source 2.4.0
         /// </summary>
         MapGuideOS2_4,
+
         /// <summary>
         /// Autodesk Infrastructure Map Server 2013 SP1
         /// </summary>
         Aims2013_SP1,
+
         /// <summary>
         /// MapGuide Open Source 2.5.0
         /// </summary>
         MapGuideOS2_5,
+
         /// <summary>
         /// Autodesk Infrastructure Map Server 2014
         /// </summary>
         Aims2014,
+
         /// <summary>
         /// MapGuide Open Source 2.4.1
         /// </summary>
         MapGuideOS2_4_1,
+
         /// <summary>
         /// MapGuide Open Source 2.5.1
         /// </summary>
         MapGuideOS2_5_1,
-	}
+    }
 
     /// <summary>
     /// Helper class containing known MapGuide Site Versions
     /// </summary>
-	public class SiteVersions
-	{
+    public class SiteVersions
+    {
         /// <summary>
         /// The array of supported site versions
         /// </summary>
-		public static readonly Version[] SiteVersionNumbers = new Version[] 
-		{ 
+        public static readonly Version[] SiteVersionNumbers = new Version[]
+		{
 			new Version(1,0,0,17864),   //MGE 2007
 			new Version(1,1,0,301),     //MGOS 1.1.0
 			new Version(1,2,0,1307),    //MGOS 1.2.0
@@ -160,10 +185,9 @@
         /// </summary>
         /// <param name="index"></param>
         /// <returns></returns>
-		public static Version GetVersion(KnownSiteVersions index)
-		{
-			return SiteVersionNumbers[(int)index];
-		}
-
-	}
-}
+        public static Version GetVersion(KnownSiteVersions index)
+        {
+            return SiteVersionNumbers[(int)index];
+        }
+    }
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Tile/BatchSettings.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Tile/BatchSettings.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Tile/BatchSettings.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.Common;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.ObjectModels.Common;
 
 namespace OSGeo.MapGuide.MaestroAPI.Tile
 {
@@ -59,42 +60,52 @@
         /// All maps are being rendered
         /// </summary>
         StartRenderAllMaps,
+
         /// <summary>
         /// A map is being rendered
         /// </summary>
         StartRenderMap,
+
         /// <summary>
         /// A group is being rendered
         /// </summary>
         StartRenderGroup,
+
         /// <summary>
         /// A scale is being rendered
         /// </summary>
         StartRenderScale,
+
         /// <summary>
         /// A tile is being rendered
         /// </summary>
         StartRenderTile,
+
         /// <summary>
         /// A tile has been rendered
         /// </summary>
         FinishRenderTile,
+
         /// <summary>
         /// A scale has been rendered
         /// </summary>
         FinishRenderScale,
+
         /// <summary>
         /// A group has been rendered
         /// </summary>
         FinishRenderGroup,
+
         /// <summary>
         /// A map has been rendered
         /// </summary>
         FinishRenderMap,
+
         /// <summary>
         /// All maps have been rendered
         /// </summary>
         FinishRenderAllMaps,
+
         /// <summary>
         /// A tile has failed to render
         /// </summary>
@@ -110,10 +121,12 @@
         /// A reference to the connection
         /// </summary>
         private IServerConnection m_connection;
+
         /// <summary>
         /// The list of maps
         /// </summary>
         private List<MapTilingConfiguration> m_maps;
+
         /// <summary>
         /// A default set of tile settings
         /// </summary>
@@ -130,46 +143,57 @@
         public System.Threading.ManualResetEvent PauseEvent = new System.Threading.ManualResetEvent(true);
 
         #region Events
+
         /// <summary>
         /// All maps are being rendered
         /// </summary>
         public event ProgressCallback BeginRenderingMaps;
+
         /// <summary>
         /// A map is being rendered
         /// </summary>
         public event ProgressCallback BeginRenderingMap;
+
         /// <summary>
         /// A group is being rendered
         /// </summary>
         public event ProgressCallback BeginRenderingGroup;
+
         /// <summary>
         /// A scale is being rendered
         /// </summary>
         public event ProgressCallback BeginRenderingScale;
+
         /// <summary>
         /// A tile is being rendered
         /// </summary>
         public event ProgressCallback BeginRenderingTile;
+
         /// <summary>
         /// All maps have been rendered
         /// </summary>
         public event ProgressCallback FinishRenderingMaps;
+
         /// <summary>
         /// A map has been rendered
         /// </summary>
         public event ProgressCallback FinishRenderingMap;
+
         /// <summary>
         /// A group has been rendered
         /// </summary>
         public event ProgressCallback FinishRenderingGroup;
+
         /// <summary>
         /// A scale has been rendered
         /// </summary>
         public event ProgressCallback FinishRenderingScale;
+
         /// <summary>
         /// A tile has been rendered
         /// </summary>
         public event ProgressCallback FinishRenderingTile;
+
         /// <summary>
         /// A tile has failed to render
         /// </summary>
@@ -235,7 +259,7 @@
             return exception;
         }
 
-        #endregion
+        #endregion Events
 
         /// <summary>
         /// Constructs a new batch setup. If no maps are supplied, all maps in the repository is assumed.
@@ -358,6 +382,7 @@
         /// The connection to the server
         /// </summary>
         public IServerConnection Connection { get { return m_connection; } }
+
         /// <summary>
         /// The list of map configurations to proccess
         /// </summary>
@@ -383,6 +408,7 @@
         /// A reference to the parent, and thus the connection
         /// </summary>
         private TilingRunCollection m_parent;
+
         /// <summary>
         /// The map read from MapGuide
         /// </summary>
@@ -423,8 +449,6 @@
         /// </summary>
         public string[] Groups { get { return m_groups; } }
 
-       
-
         /// <summary>
         /// The map's scales may have been modified, this array is a map of the new values
         /// </summary>
@@ -476,14 +500,14 @@
 
             m_dimensions = new long[this.Resolutions][];
             m_scaleindexmap = new int[m_dimensions.Length];
-            
+
             double width_in_meters = Math.Abs(m_parent.Config.MetersPerUnit * (extents.MaxX - extents.MinX));
             double height_in_meters = Math.Abs(m_parent.Config.MetersPerUnit * (extents.MaxY - extents.MinY));
 
             m_dimensions = new long[this.Resolutions][];
             for (int i = this.Resolutions - 1; i >= 0; i--)
             {
-                long rows, cols, rowTileOffset = 0 , colTileOffset = 0;
+                long rows, cols, rowTileOffset = 0, colTileOffset = 0;
                 double scale = m_mapdefinition.BaseMap.GetScaleAt(i);
 
                 // This is the official method, and the only one MgCooker will ever use
@@ -502,7 +526,7 @@
                 // where 0.079375 = [inch to meter] / image DPI * tile size = 0.0254 / 96 * 300.
                 //
                 // This assumes you know the scale factor that converts your map width and height to meters. You can get this from the coordinate system of the map if you don't know it, but it's much easier to just plug in the number into this equation.
-                // 
+                //
                 // Also have in mind that you can also request tiles beyond the map extent (for example tile (-1, -1), however, there is probably no point to cache them unless you have valid data outside your initial map extents.
 
                 //The tile extent in meters
@@ -529,11 +553,10 @@
                     //GT 03/08/2014 - the right number of columns/rows it's the the end tile (maxtileoffset, ex 12) - the start tile (coltileoffset, ex 11) +1
                     //i.e. 12-11+1=2 so 2 columns
                     cols = (colMaxTileOffset - colTileOffset) + 1;
-                    rows = (rowMinTileOffset - rowTileOffset) + 1; 
+                    rows = (rowMinTileOffset - rowTileOffset) + 1;
                 }
 
-
-                m_dimensions[i] = new long[] { rows, cols, rowTileOffset , colTileOffset};
+                m_dimensions[i] = new long[] { rows, cols, rowTileOffset, colTileOffset };
             }
         }
 
@@ -544,14 +567,13 @@
         public void SetGroups(string[] groups)
         {
             List<string> g = new List<string>();
-            for(int i = 0; i < m_groups.Length; i++)
+            for (int i = 0; i < m_groups.Length; i++)
                 if (Array.IndexOf<string>(groups, m_groups[i]) >= 0)
                     g.Add(m_groups[i]);
 
             m_groups = g.ToArray();
         }
 
-
         /// <summary>
         /// Sets the list of scale indexes and sets the maximum extent to the given envelope
         /// </summary>
@@ -563,7 +585,6 @@
             SetScales(scales);
         }
 
-
         /// <summary>
         /// Sets the list of scale indexes
         /// </summary>
@@ -633,7 +654,6 @@
             }
         }
 
-
         /// <summary>
         /// Renders all tiles in a given scale
         /// </summary>
@@ -653,7 +673,7 @@
                 //If the MaxExtents are different from the actual bounds, we need a start offset offset
 
                 RenderThreads settings = new RenderThreads(this, m_parent, m_scaleindexmap[scaleindex], group, m_mapdefinition.ResourceID, rows, cols, rowTileOffset, colTileOffset, m_parent.Config.RandomizeTileSequence);
-                
+
                 settings.RunAndWait();
 
                 if (settings.TileSet.Count != 0 && !m_parent.Cancel)
@@ -661,10 +681,8 @@
             }
 
             m_parent.InvokeFinishRendering(this, group, scaleindex);
-
         }
 
-
         /// <summary>
         /// Renders all tiles in all scales
         /// </summary>
@@ -675,7 +693,6 @@
 
             if (!m_parent.Cancel)
             {
-
                 for (int i = this.Resolutions - 1; i >= 0; i--)
                     if (m_parent.Cancel)
                         break;
@@ -684,7 +701,6 @@
             }
 
             m_parent.InvokeFinishRendering(this, group);
-
         }
 
         /// <summary>
@@ -734,8 +750,6 @@
         /// Gets a reference to the parent tiling run collection
         /// </summary>
         public TilingRunCollection Parent { get { return m_parent; } }
-
-       
     }
 
     /// <summary>
@@ -792,6 +806,7 @@
         /// Gets or sets whether to randomize the tile generation sequence
         /// </summary>
         public bool RandomizeTileSequence = false;
+
         private int m_threadCount = 1;
 
         /// <summary>
@@ -818,4 +833,4 @@
         /// <param name="scale"></param>
         public delegate void RenderMethodDelegate(string map, string group, int col, int row, int scale);
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Tile/RenderThread.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Tile/RenderThread.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Tile/RenderThread.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,28 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Services;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Services;
 using System.Threading;
 
 namespace OSGeo.MapGuide.MaestroAPI.Tile
@@ -107,7 +108,7 @@
             while (!completed)
             {
                 EventPassing eventToRaise = null;
-                while(true)
+                while (true)
                 {
                     lock (SyncLock)
                         if (RaiseEvents.Count > 0)
@@ -130,6 +131,7 @@
                                     eventToRaise.Row,
                                     eventToRaise.Col);
                                 break;
+
                             case EventPassing.EventType.Finish:
                                 Parent.InvokeFinishRendering(
                                     Invoker,
@@ -138,6 +140,7 @@
                                     eventToRaise.Row,
                                     eventToRaise.Col);
                                 break;
+
                             case EventPassing.EventType.Error:
                                 eventToRaise.Result = Parent.InvokeError(
                                     Invoker,
@@ -147,8 +150,9 @@
                                     eventToRaise.Col,
                                     ref eventToRaise.Exception);
                                 break;
+
                             default:
-                                //Not translated, because it is an internal error that should never happen 
+                                //Not translated, because it is an internal error that should never happen
                                 throw new Exception("Bad event type"); //NOXLATE
                         }
                         eventToRaise.Event.Set();
@@ -218,10 +222,9 @@
             }
             finally
             {
-                lock(SyncLock)
+                lock (SyncLock)
                     FillerComplete = true;
             }
-
         }
 
         /// <summary>
@@ -259,7 +262,6 @@
                 var tileSvc = (ITileService)con.GetService((int)ServiceType.Tile);
                 AutoResetEvent ev = new AutoResetEvent(false);
 
-
                 while (!Parent.Cancel)
                 {
                     KeyValuePair<int, int>? round = null;
@@ -281,8 +283,6 @@
                     else
                         RenderTile(ev, tileSvc, round.Value.Key, round.Value.Value, Scale, Group);
                 }
-
-
             }
             catch { }
             finally
@@ -292,7 +292,6 @@
             }
         }
 
-
         /// <summary>
         /// Renders a single tile
         /// </summary>
@@ -337,7 +336,7 @@
                         Exception pex = ex;
                         ev.Reset();
                         EventPassing evobj = new EventPassing(
-                            EventPassing.EventType.Error ,
+                            EventPassing.EventType.Error,
                                 (int)row, (int)col, ex,
                                 ev
                                 );
@@ -364,7 +363,7 @@
             ev.Reset();
             lock (SyncLock)
             {
-                RaiseEvents.Enqueue(new EventPassing( 
+                RaiseEvents.Enqueue(new EventPassing(
                     EventPassing.EventType.Finish,
                     (int)row, (int)col, null,
                     ev
@@ -373,6 +372,5 @@
             }
             ev.WaitOne(Timeout.Infinite, true);
         }
-
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utf8XmlWriter.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utf8XmlWriter.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utf8XmlWriter.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,42 +1,43 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
-using System;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI
 {
-	/// <summary>
-	/// Overrides the default XmlWriter, to ensure that the Xml is Utf8 and with whitespaces, as the MapGuide server requires Utf8
-	/// </summary>
-	public class Utf8XmlWriter : System.Xml.XmlTextWriter
-	{
+    /// <summary>
+    /// Overrides the default XmlWriter, to ensure that the Xml is Utf8 and with whitespaces, as the MapGuide server requires Utf8
+    /// </summary>
+    public class Utf8XmlWriter : System.Xml.XmlTextWriter
+    {
         /// <summary>
         /// Initializes a new instance of the <see cref="Utf8XmlWriter"/> class.
         /// </summary>
         /// <param name="s">The s.</param>
-		public Utf8XmlWriter(System.IO.Stream s) 
+        public Utf8XmlWriter(System.IO.Stream s)
             //This creation of the UTF8 encoder removes the BOM
             //Which is required because MapGuide has trouble reading files with a BOM.
-			: base(s, new System.Text.UTF8Encoding(false, true)) 
-		{
+            : base(s, new System.Text.UTF8Encoding(false, true))
+        {
             Initialize();
-		}
+        }
 
         private void Initialize()
         {
@@ -50,7 +51,8 @@
         /// Initializes a new instance of the <see cref="Utf8XmlWriter"/> class.
         /// </summary>
         /// <param name="w">The TextWriter to write to. It is assumed that the TextWriter is already set to the correct encoding.</param>
-		public Utf8XmlWriter(System.IO.TextWriter w) : base(w) 
+        public Utf8XmlWriter(System.IO.TextWriter w)
+            : base(w)
         {
             Initialize();
         }
@@ -61,7 +63,11 @@
         /// <exception cref="T:System.InvalidOperationException">
         /// This is not the first write method called after the constructor.
         /// </exception>
-		public override void WriteStartDocument() {Utf8WriteHeader();}
+        public override void WriteStartDocument()
+        {
+            Utf8WriteHeader();
+        }
+
         /// <summary>
         /// Writes the XML declaration with the version "1.0" and the standalone attribute.
         /// </summary>
@@ -69,11 +75,14 @@
         /// <exception cref="T:System.InvalidOperationException">
         /// This is not the first write method called after the constructor.
         /// </exception>
-		public override void WriteStartDocument(bool standalone) {Utf8WriteHeader();}
+        public override void WriteStartDocument(bool standalone)
+        {
+            Utf8WriteHeader();
+        }
 
-		private void Utf8WriteHeader()
-		{
+        private void Utf8WriteHeader()
+        {
             base.WriteRaw("<?xml version=\"1.0\" encoding=\"utf-8\"?>"); //NOXLATE
-		}
-	}
-}
+        }
+    }
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Utility.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,43 +1,45 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
-using System;
-using System.Drawing;
-using System.Collections.Generic;
+//
+
+#endregion Disclaimer / License
+
+using GeoAPI.Geometries;
+using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
 using OSGeo.MapGuide.MaestroAPI.IO;
 using OSGeo.MapGuide.MaestroAPI.Schema;
-using System.Collections.Specialized;
-using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
 using OSGeo.MapGuide.ObjectModels;
-using System.Xml;
-using GeoAPI.Geometries;
+using OSGeo.MapGuide.ObjectModels.Capabilities;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
+using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Drawing;
 using System.Globalization;
-using OSGeo.MapGuide.MaestroAPI.Resource;
+using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
-using OSGeo.MapGuide.ObjectModels.Capabilities;
-using System.ComponentModel;
+using System.Xml;
 using System.Xml.Serialization;
-using System.IO;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 
 namespace OSGeo.MapGuide.MaestroAPI
 {
@@ -291,7 +293,6 @@
             return digit.ToString(m_enCI);
         }
 
-
         /// <summary>
         /// Copies the content of a stream into another stream.
         /// Automatically attempts to rewind the source stream.
@@ -319,8 +320,8 @@
             {
                 if (source.CanSeek)
                 {
-                    try 
-                    { 
+                    try
+                    {
                         source.Position = 0;
                         //rewound = true;
                     }
@@ -342,7 +343,7 @@
 
             do
             {
-                r  = source.Read(buf, 0, buf.Length);
+                r = source.Read(buf, 0, buf.Length);
                 target.Write(buf, 0, r);
             } while (r > 0);
         }
@@ -372,7 +373,7 @@
             long freqCount = 0;
 
             if (callback != null)
-                callback(copied, length > 0 ? (length - copied) : -1 , length);
+                callback(copied, length > 0 ? (length - copied) : -1, length);
 
             int r;
             byte[] buf = new byte[1024];
@@ -380,7 +381,7 @@
             {
                 r = source.Read(buf, 0, buf.Length);
                 target.Write(buf, 0, r);
-                
+
                 copied += r;
                 freqCount += r;
 
@@ -390,7 +391,6 @@
                     if (callback != null)
                         callback(copied, length > 0 ? (length - copied) : -1, length);
                 }
-
             } while (r > 0);
 
             if (callback != null)
@@ -424,20 +424,20 @@
         /// <returns>A copied object</returns>
         public static object DeepCopy(object source, object target)
         {
-            foreach(System.Reflection.PropertyInfo pi in source.GetType().GetProperties())
+            foreach (System.Reflection.PropertyInfo pi in source.GetType().GetProperties())
             {
                 if (!pi.CanRead || !pi.CanWrite)
                     continue;
 
-                if (!pi.PropertyType.IsClass || pi.PropertyType == typeof(string) )
-                    pi.SetValue(target, pi.GetValue(source, null) , null);
+                if (!pi.PropertyType.IsClass || pi.PropertyType == typeof(string))
+                    pi.SetValue(target, pi.GetValue(source, null), null);
                 else if (pi.GetValue(source, null) == null)
                     pi.SetValue(target, null, null);
                 else if (pi.GetValue(source, null).GetType().GetInterface(typeof(System.Collections.ICollection).FullName) != null)
                 {
                     System.Collections.ICollection srcList = (System.Collections.ICollection)pi.GetValue(source, null);
                     System.Collections.ICollection trgList = (System.Collections.ICollection)Activator.CreateInstance(srcList.GetType());
-                    foreach(object o in srcList)
+                    foreach (object o in srcList)
                         trgList.GetType().GetMethod("Add").Invoke(trgList, new object[] { DeepCopy(o) }); //NOXLATE
                     pi.SetValue(target, trgList, null);
                 }
@@ -445,7 +445,7 @@
                 {
                     System.Array sourceArr = (System.Array)pi.GetValue(source, null);
                     System.Array targetArr = (System.Array)Activator.CreateInstance(sourceArr.GetType(), new object[] { sourceArr.Length });
-                    for(int i = 0; i < targetArr.Length; i++)
+                    for (int i = 0; i < targetArr.Length; i++)
                         targetArr.SetValue(DeepCopy(sourceArr.GetValue(i)), i);
                     pi.SetValue(target, targetArr, null);
                 }
@@ -460,8 +460,6 @@
             return target;
         }
 
-
-
         /// <summary>
         /// Makes a deep copy of an object, by copying all the public properties
         /// </summary>
@@ -474,20 +472,20 @@
 
             object target = Activator.CreateInstance(source.GetType());
 
-            foreach(System.Reflection.PropertyInfo pi in source.GetType().GetProperties())
+            foreach (System.Reflection.PropertyInfo pi in source.GetType().GetProperties())
             {
                 if (!pi.CanRead || !pi.CanWrite)
                     continue;
 
-                if (!pi.PropertyType.IsClass || pi.PropertyType == typeof(string) )
-                    pi.SetValue(target, pi.GetValue(source, null) , null);
+                if (!pi.PropertyType.IsClass || pi.PropertyType == typeof(string))
+                    pi.SetValue(target, pi.GetValue(source, null), null);
                 else if (pi.GetValue(source, null) == null)
                     pi.SetValue(target, null, null);
                 else if (pi.GetValue(source, null).GetType().GetInterface(typeof(System.Collections.ICollection).FullName) != null)
                 {
                     System.Collections.ICollection srcList = (System.Collections.ICollection)pi.GetValue(source, null);
                     System.Collections.ICollection trgList = (System.Collections.ICollection)Activator.CreateInstance(srcList.GetType());
-                    foreach(object o in srcList)
+                    foreach (object o in srcList)
                         trgList.GetType().GetMethod("Add").Invoke(trgList, new object[] { DeepCopy(o) }); //NOXLATE
                     pi.SetValue(target, trgList, null);
                 }
@@ -495,7 +493,7 @@
                 {
                     System.Array sourceArr = (System.Array)pi.GetValue(source, null);
                     System.Array targetArr = (System.Array)Activator.CreateInstance(sourceArr.GetType(), new object[] { sourceArr.Length });
-                    for(int i = 0; i < targetArr.Length; i++)
+                    for (int i = 0; i < targetArr.Length; i++)
                         targetArr.SetValue(DeepCopy(sourceArr.GetValue(i)), i);
                     pi.SetValue(target, targetArr, null);
                 }
@@ -506,8 +504,6 @@
             return target;
         }
 
-        
-
         /// <summary>
         /// Reads all data from a stream, and returns it as a single array.
         /// Note that this is very inefficient if the stream is several megabytes long.
@@ -524,7 +520,7 @@
                 System.IO.MemoryStream ms = new System.IO.MemoryStream();
                 byte[] buf = new byte[1024];
                 int c;
-                while((c = s.Read(buf, 0, buf.Length)) > 0)
+                while ((c = s.Read(buf, 0, buf.Length)) > 0)
                     ms.Write(buf, 0, c);
                 return ms.ToArray();
             }
@@ -674,7 +670,6 @@
             }
 
             return doc2.OuterXml == "<FeatureSet />" ? "" : doc2.OuterXml; //NOXLATE
-            
         }
 
         /// <summary>
@@ -727,7 +722,7 @@
             // Encode any characters that are not allowed in XML names.
             // The encoding pattern is "-x%x-" where %x is the character value in hexidecimal.
             // The dash delimeters were an unfortunate choice since dash cannot be the 1st character
-            // in an XML name. When the 1st character needs to be encoded, it is encoded as "_x%x-" to 
+            // in an XML name. When the 1st character needs to be encoded, it is encoded as "_x%x-" to
             // resolve this issue.
             for (int i = 0; i < tokens.Length; i++)
             {
@@ -747,10 +742,10 @@
                 else if (TokenRegex2.Match(token, 0).Success && i == 0)
                 {
                     bMatchedToken = true;
-                    // the token happens to match the encoding pattern for the 1st character. 
-                    // We want to avoid decoding this sub-string on decode. 
-                    // This is done by prepending a dummy encoding for character 0. This character is 
-                    // discarded on decode. 
+                    // the token happens to match the encoding pattern for the 1st character.
+                    // We want to avoid decoding this sub-string on decode.
+                    // This is done by prepending a dummy encoding for character 0. This character is
+                    // discarded on decode.
                     outName.Append("_x00-");
                 }
                 else
@@ -768,7 +763,6 @@
                 outName.Append(bMatchedToken ? token : ReplaceBadChars(token, outName.Length == 0));
             }
 
-
             char c = outName[0];
 
             //Perform actual substitutions of bad characters
@@ -781,12 +775,15 @@
                 case ' ':
                     prefix = "_x20-";
                     break;
+
                 case '-':
                     prefix = "_x2d-";
                     break;
+
                 case '&':
                     prefix = "_x26-";
                     break;
+
                 default:
                     if (Char.IsDigit(c))
                     {
@@ -888,7 +885,6 @@
             return decoded.ToString();
         }
 
-
         /// <summary>
         /// Enumerates all xml nodes in the document, and looks for tags or attributes named ResourceId
         /// </summary>
@@ -934,7 +930,7 @@
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public delegate void EnumerateObjectCallback(object obj);
 
@@ -944,6 +940,7 @@
         private class EnumerateObjectCollector
         {
             public List<object> items = new List<object>();
+
             public void AddItem(object o)
             {
                 items.Add(o);
@@ -960,7 +957,7 @@
             if (obj == null || c == null)
                 return;
 
-            Dictionary<object, object> visited = new Dictionary<object,object>();
+            Dictionary<object, object> visited = new Dictionary<object, object>();
 
             Queue<object> items = new Queue<object>();
             items.Enqueue(obj);
@@ -1126,6 +1123,7 @@
                         if (oar.Label != null)
                             ar.Label = oar.Label.Clone();
                         break;
+
                     case StyleType.Line:
                         range.AreaStyle = null;
                         range.PointStyle = null;
@@ -1141,6 +1139,7 @@
                         if (olr.Label != null)
                             lr.Label = olr.Label.Clone();
                         break;
+
                     case StyleType.Point:
                         range.AreaStyle = null;
                         range.LineStyle = null;
@@ -1164,7 +1163,7 @@
             }
         }
 
-        const string RESERVED_CHARS = "\\:*?\"<>|&'%=/";
+        private const string RESERVED_CHARS = "\\:*?\"<>|&'%=/";
 
         /// <summary>
         /// Creates a default Layer Definition from the given Class Definition
@@ -1296,25 +1295,25 @@
             {
                 ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>()
                 {
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "aValue", //NOXLATE
                         Description = Strings.Func_ARGB_AValueDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.Int32
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "rValue", //NOXLATE
                         Description = Strings.Func_ARGB_RValueDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.Int32
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "gValue", //NOXLATE
                         Description = Strings.Func_ARGB_GValueDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.Int32
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "bValue", //NOXLATE
                         Description = Strings.Func_ARGB_BValueDescription,
@@ -1330,7 +1329,7 @@
             {
                 ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>()
                 {
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "strValue", //NOXLATE
                         Description = Strings.Func_DECAP_StringValueDescription,
@@ -1362,19 +1361,19 @@
             {
                 ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>()
                 {
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "condition", //NOXLATE
                         Description = Strings.Func_IF_ConditionDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "trueValue", //NOXLATE
                         Description = Strings.Func_IF_TrueValueDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "falseValue", //NOXLATE
                         Description = Strings.Func_IF_FalseValueDescription,
@@ -1398,25 +1397,25 @@
             {
                 ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>()
                 {
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "expression", //NOXLATE
                         Description = Strings.Func_LOOKUP_ExpressionDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "defaultValue", //NOXLATE
                         Description = Strings.Func_LOOKUP_DefaultValueDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "index", //NOXLATE
                         Description = Strings.Func_LOOKUP_IndexDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "value", //NOXLATE
                         Description = Strings.Func_LOOKUP_ValueDescription,
@@ -1440,31 +1439,31 @@
             {
                 ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>()
                 {
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "expression", //NOXLATE
                         Description = Strings.Func_RANGE_ExpressionDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "rangeMin", //NOXLATE
                         Description = Strings.Func_RANGE_MinDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "rangeMax", //NOXLATE
                         Description = Strings.Func_RANGE_MaxDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "defaultValue", //NOXLATE
                         Description = Strings.Func_RANGE_DefaultValueDescription,
                         DataType = FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinitionDataType.String
                     },
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "value", //NOXLATE
                         Description = Strings.Func_RANGE_ValueDescription,
@@ -1488,7 +1487,7 @@
             {
                 ArgumentDefinitionList = new BindingList<FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition>()
                 {
-                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition() 
+                    new FdoProviderCapabilitiesExpressionFunctionDefinitionArgumentDefinition()
                     {
                         Name = "strValue", //NOXLATE
                         Description = Strings.Func_URLENCODE_StringValueDescription,
@@ -1575,7 +1574,7 @@
         /// Creates color with corrected brightness.
         /// </summary>
         /// <param name="color">Color to correct.</param>
-        /// <param name="correctionFactor">The brightness correction factor. Must be between -1 and 1. 
+        /// <param name="correctionFactor">The brightness correction factor. Must be between -1 and 1.
         /// Negative values produce darker colors.</param>
         /// <returns>
         /// Corrected <see cref="Color"/> structure.
@@ -1639,4 +1638,4 @@
         /// </summary>
         public string LayerPrefix { get; set; }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/WeakEventHandler.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/WeakEventHandler.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/WeakEventHandler.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,22 +1,25 @@
 #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
+//
+
+#endregion Disclaimer / License
+
 using System;
 using System.Reflection;
 
@@ -28,43 +31,46 @@
     {
         private class WeakEventHandlerImpl
         {
-            protected readonly WeakReference m_wrTarget; // WeakReference to original delegate's target object 
-            protected Delegate m_openEventHandler;       // "Open" delegate to invoke original target's delegate method 
+            protected readonly WeakReference m_wrTarget; // WeakReference to original delegate's target object
+            protected Delegate m_openEventHandler;       // "Open" delegate to invoke original target's delegate method
 
-            public WeakEventHandlerImpl(Delegate d) { m_wrTarget = new WeakReference(d.Target); }
+            public WeakEventHandlerImpl(Delegate d)
+            {
+                m_wrTarget = new WeakReference(d.Target);
+            }
 
-            // Match is used to compare a WeakEventHandlerImpl object with an actual delegate. 
-            // Typically used to remove a WeakEventHandlerImpl from an event collection. 
+            // Match is used to compare a WeakEventHandlerImpl object with an actual delegate.
+            // Typically used to remove a WeakEventHandlerImpl from an event collection.
             public Boolean Match(Delegate strongEventHandler)
             {
-                // Returns true if original target & method match the WeakEventHandlerImpl's Target & method 
+                // Returns true if original target & method match the WeakEventHandlerImpl's Target & method
                 return (m_wrTarget.Target == strongEventHandler.Target) && (m_openEventHandler.Method == strongEventHandler.Method);
             }
         }
 
-        // "Open" delegate definition to quickly invoke original delegate's callback 
+        // "Open" delegate definition to quickly invoke original delegate's callback
         private delegate void OpenEventHandler<TTarget, TEventArgs>(TTarget target, Object sender, TEventArgs eventArgs)
             where TTarget : class
             where TEventArgs : EventArgs;
 
-        // A proxy object that knows how to invoke a callback on an object if it hasn't been GC'd 
+        // A proxy object that knows how to invoke a callback on an object if it hasn't been GC'd
         private sealed class WeakEventHandlerImpl<TEventHandler> : WeakEventHandlerImpl where TEventHandler : class
         {
-            // Refers to a method that removes a delegate to this proxy object once we know the original target has been GC'd 
+            // Refers to a method that removes a delegate to this proxy object once we know the original target has been GC'd
             private readonly Action<TEventHandler> m_cleanup;
 
-            // This is the delegate passed to m_cleanup that needs to be removed from an event 
+            // This is the delegate passed to m_cleanup that needs to be removed from an event
             private readonly TEventHandler m_proxyHandler;
 
             public static TEventHandler Create(TEventHandler eh, Action<TEventHandler> cleanup)
             {
                 Check.That(eh != null && cleanup != null, "eh != null && cleanup != null");
-                // We don't create weak events for static methods since types don't get GC'd 
-                Delegate d = (Delegate)(Object)eh;  // We know that all event handlers are derived from Delegate 
+                // We don't create weak events for static methods since types don't get GC'd
+                Delegate d = (Delegate)(Object)eh;  // We know that all event handlers are derived from Delegate
                 if (d.Target == null) return eh;
 
                 var weh = new WeakEventHandlerImpl<TEventHandler>(d, cleanup);
-                return weh.m_proxyHandler; // Return the delegate to add to the event 
+                return weh.m_proxyHandler; // Return the delegate to add to the event
             }
 
             private WeakEventHandlerImpl(Delegate d, Action<TEventHandler> cleanup)
@@ -78,13 +84,13 @@
                    ? eventHandlerType.GetGenericArguments()[0]
                    : eventHandlerType.GetMethod("Invoke").GetParameters()[1].ParameterType;
 
-                // Create a delegate to the ProxyInvoke method; this delegate is registered with the event 
+                // Create a delegate to the ProxyInvoke method; this delegate is registered with the event
                 var miProxy = typeof(WeakEventHandlerImpl<TEventHandler>)
                    .GetMethod("ProxyInvoke", BindingFlags.Instance | BindingFlags.NonPublic)
                    .MakeGenericMethod(targetType, eventArgsType);
                 m_proxyHandler = (TEventHandler)(Object)Delegate.CreateDelegate(eventHandlerType, this, miProxy);
 
-                // Create an "open" delegate to the original delegate's method; ProxyInvoke calls this 
+                // Create an "open" delegate to the original delegate's method; ProxyInvoke calls this
                 Type openEventHandlerType = typeof(OpenEventHandler<,>).MakeGenericType(d.Target.GetType(), eventArgsType);
                 m_openEventHandler = Delegate.CreateDelegate(openEventHandlerType, null, d.Method);
             }
@@ -93,7 +99,7 @@
                 where TTarget : class
                 where TEventArgs : EventArgs
             {
-                // If the original target object still exists, call it; else call m_cleanup to unregister our delegate with the event 
+                // If the original target object still exists, call it; else call m_cleanup to unregister our delegate with the event
                 TTarget target = (TTarget)m_wrTarget.Target;
                 if (target != null)
                 {
@@ -107,19 +113,22 @@
             }
         }
 
-        // We offer this overload because it is so common 
+        // We offer this overload because it is so common
         public static EventHandler Wrap(EventHandler eh, Action<EventHandler> cleanup)
         {
             return WeakEventHandlerImpl<EventHandler>.Create(eh, cleanup);
         }
+
         public static TEventHandler Wrap<TEventHandler>(TEventHandler eh, Action<TEventHandler> cleanup) where TEventHandler : class
         {
             return WeakEventHandlerImpl<TEventHandler>.Create(eh, cleanup);
         }
+
         public static EventHandler<TEventArgs> Wrap<TEventArgs>(EventHandler<TEventArgs> eh, Action<EventHandler<TEventArgs>> cleanup) where TEventArgs : EventArgs
         {
             return WeakEventHandlerImpl<EventHandler<TEventArgs>>.Create(eh, cleanup);
         }
+
         public static Boolean Match(Delegate weakEventHandler, Delegate strongEventHandler)
         {
             return ((WeakEventHandlerImpl)weakEventHandler.Target).Match(strongEventHandler);

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/XmlValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/XmlValidator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/XmlValidator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,37 +1,36 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
-using System;
+//
 
+#endregion Disclaimer / License
+
 namespace OSGeo.MapGuide.MaestroAPI
 {
+    using OSGeo.MapGuide.MaestroAPI.Exceptions;
+    using OSGeo.MapGuide.MaestroAPI.Resource;
     using System;
-    using System.Collections;
-    using System.Data;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
     using System.IO;
+    using System.Text;
     using System.Xml;
     using System.Xml.Schema;
-    using System.Text;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using OSGeo.MapGuide.MaestroAPI.Resource;
-    using OSGeo.MapGuide.MaestroAPI.Exceptions;
 
     ///<summary>
     /// Class that makes XSD validation
@@ -70,7 +69,7 @@
             var config = new XmlReaderSettings();
             if (xsds != null && xsds.Length > 0)
             {
-                foreach(var xsd in xsds)
+                foreach (var xsd in xsds)
                     config.Schemas.Add(xsd);
             }
             config.ValidationType = ValidationType.Schema;
@@ -270,4 +269,4 @@
             warnings = warn.ToArray();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/packages.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="fleesharp" version="0.9.27-pre" targetFramework="net40-Client" />
+    <package id="fleesharp" version="0.9.27-pre" targetFramework="net40-Client" />
 </packages>
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Commands/HttpCreateRuntimeMap.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Commands/HttpCreateRuntimeMap.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Commands/HttpCreateRuntimeMap.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Commands;
 using OSGeo.MapGuide.ObjectModels.RuntimeMap;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.Http.Commands
 {
@@ -101,4 +100,4 @@
                 this.IconHeight);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Commands/HttpDescribeRuntimeMap.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Commands/HttpDescribeRuntimeMap.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Commands/HttpDescribeRuntimeMap.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2013, 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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Commands;
 using OSGeo.MapGuide.ObjectModels.RuntimeMap;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.Http.Commands
 {
@@ -93,4 +92,4 @@
                 this.IconHeight);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Commands/HttpGetFdoCacheInfo.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Commands/HttpGetFdoCacheInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Commands/HttpGetFdoCacheInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Commands;
 
 namespace OSGeo.MapGuide.MaestroAPI.Http.Commands
@@ -40,4 +40,4 @@
             return _conn.GetFdoCacheInfo();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Commands/HttpGetResourceContents.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Commands/HttpGetResourceContents.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Commands/HttpGetResourceContents.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Mapping;
-using OSGeo.MapGuide.MaestroAPI.Services;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Commands;
 using OSGeo.MapGuide.MaestroAPI.Resource;
-using System.Net;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using System.Collections.Generic;
 using System.Threading;
-using System.Diagnostics;
-using OSGeo.MapGuide.MaestroAPI.Commands;
 
 namespace OSGeo.MapGuide.MaestroAPI.Http.Commands
 {
@@ -66,8 +64,8 @@
                 //NOTE: Multi-threaded code is my weakness. So I wouldn't be surprised
                 //if this has some subtle bug due to multi-threading. However, I have
                 //stuck to basic rules of thumb in implementing this (ie. Do not let threads
-                //manipulate shared state!). The whole code path of the 
-                //IResourceService.GetResource() implementation does not touch any shared 
+                //manipulate shared state!). The whole code path of the
+                //IResourceService.GetResource() implementation does not touch any shared
                 //state. So I say with minor confidence that this should work without problems.
                 ThreadPool.QueueUserWorkItem((obj) =>
                 {
@@ -96,4 +94,4 @@
             private set;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpCapabilities.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpCapabilities.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpCapabilities.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Capability;
+using OSGeo.MapGuide.MaestroAPI.Commands;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using OSGeo.MapGuide.MaestroAPI.Capability;
-using OSGeo.MapGuide.MaestroAPI.Commands;
 
 namespace OSGeo.MapGuide.MaestroAPI.Http
 {
@@ -31,15 +31,15 @@
     {
         private HttpServerConnection _implConn;
 
-        internal HttpCapabilities(IServerConnection parent) 
-            : base(parent) 
+        internal HttpCapabilities(IServerConnection parent)
+            : base(parent)
         {
             _implConn = parent as HttpServerConnection;
         }
 
         public override int[] SupportedCommands
         {
-            get 
+            get
             {
                 List<int> cmds = new List<int>();
                 //TODO: Work out what this can/can't do
@@ -66,4 +66,4 @@
             get { return false; }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpCoordinateSystem.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpCoordinateSystem.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpCoordinateSystem.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,39 +1,44 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
+//
+
+#endregion Disclaimer / License
+
 using System.Xml;
-using System.Collections;
-using System.Collections.Generic;
 
 namespace OSGeo.MapGuide.MaestroAPI
 {
     using CoordinateSystem;
+
     /// <summary>
     /// Interface to MapGuide coordinate system functions.
     /// Only works with server > 1.2, since the coordinate mapping is not avalible through Http on older versions
     /// </summary>
     public class HttpCoordinateSystemDefinition : CoordinateSystem.CoordinateSystemDefinitionBase
     {
-        internal HttpCoordinateSystemDefinition() : base() { }
+        internal HttpCoordinateSystemDefinition()
+            : base()
+        {
+        }
 
-        internal HttpCoordinateSystemDefinition(CoordinateSystemCategory parent, XmlNode topnode) : base(parent)
+        internal HttpCoordinateSystemDefinition(CoordinateSystemCategory parent, XmlNode topnode)
+            : base(parent)
         {
             foreach (XmlNode node in topnode.ChildNodes)
             {
@@ -42,24 +47,31 @@
                     case "code":
                         m_code = node["Value"].InnerText;
                         break;
+
                     case "description":
                         m_description = node["Value"].InnerText;
                         break;
+
                     case "projection":
                         m_projection = node["Value"].InnerText;
                         break;
+
                     case "projection description":
                         m_projectionDescription = node["Value"].InnerText;
                         break;
+
                     case "Datum":
                         m_datum = node["Value"].InnerText;
                         break;
+
                     case "datum description":
                         m_datumDescription = node["Value"].InnerText;
                         break;
+
                     case "ellipsoid":
                         m_ellipsoid = node["Value"].InnerText;
                         break;
+
                     case "ellipsoid description":
                         m_ellipsoidDescription = node["Value"].InnerText;
                         break;
@@ -67,4 +79,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpCoordinateSystemCatalog.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpCoordinateSystemCatalog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpCoordinateSystemCatalog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
 using System.Xml;
-using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
 
 namespace OSGeo.MapGuide.MaestroAPI
 {
@@ -39,6 +39,7 @@
         }
 
         internal HttpServerConnection Connection { get { return m_con; } }
+
         internal RequestBuilder RequestBuilder { get { return m_req; } }
 
         public override CoordinateSystemCategory[] Categories
@@ -52,7 +53,7 @@
                     doc.Load(m_con.OpenRead(req));
                     XmlNodeList lst = doc.SelectNodes("StringCollection/Item");
                     CoordinateSystemCategory[] data = new CoordinateSystemCategory[lst.Count];
-                    for(int i = 0; i < lst.Count; i++)
+                    for (int i = 0; i < lst.Count; i++)
                         data[i] = new HttpCoordinateSystemCategory(this, lst[i].InnerText);
                     m_categories = data;
                 }
@@ -63,7 +64,7 @@
 
         public override string LibraryName
         {
-            get 
+            get
             {
                 if (m_coordLib == null)
                 {
@@ -137,4 +138,4 @@
             return new HttpCoordinateSystemDefinition();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpCoordinateSystemCategory.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpCoordinateSystemCategory.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpCoordinateSystemCategory.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
 
 namespace OSGeo.MapGuide.MaestroAPI
 {
     public class HttpCoordinateSystemCategory : CoordinateSystemCategory
     {
-        public HttpCoordinateSystemCategory(ICoordinateSystemCatalog parent, string name) : base(parent, name) { }
+        public HttpCoordinateSystemCategory(ICoordinateSystemCatalog parent, string name)
+            : base(parent, name)
+        {
+        }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpResourcePreviewUrlGenerator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpResourcePreviewUrlGenerator.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpResourcePreviewUrlGenerator.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,22 +1,25 @@
 #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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Resource.Preview;
 using OSGeo.MapGuide.ObjectModels;
@@ -26,14 +29,13 @@
 using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 using OSGeo.MapGuide.ObjectModels.WebLayout;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.Http
 {
-    class HttpResourcePreviewUrlGenerator : ResourcePreviewUrlGenerator
+    internal class HttpResourcePreviewUrlGenerator : ResourcePreviewUrlGenerator
     {
         private string _rootUrl;
 
@@ -207,14 +209,14 @@
         protected override string GenerateFeatureSourcePreviewUrl(Resource.IResource res, string locale, bool isNew, string sessionID)
         {
             string url = GetRootUrl();
-            
+
             var resId = res.ResourceID;
             url += "schemareport/describeschema.php?viewer=basic&schemaName=&className=&resId=" + resId + "&sessionId=" + sessionID + "&locale=" + GetLocale(locale); //NOXLATE
 
             return url;
         }
 
-        private static string[] PREVIEWABLE_RESOURCE_TYPES = new string[] 
+        private static string[] PREVIEWABLE_RESOURCE_TYPES = new string[]
         {
             ResourceTypes.FeatureSource.ToString(),
             ResourceTypes.ApplicationDefinition.ToString(),
@@ -229,7 +231,7 @@
             return Array.IndexOf(PREVIEWABLE_RESOURCE_TYPES, resourceType) >= 0;
         }
 
-        static void AttachPreviewCommands(IWebLayout wl)
+        private static void AttachPreviewCommands(IWebLayout wl)
         {
             var cmd = wl.CreateInvokeScriptCommand();
             cmd.Name = "ZoomScale"; //NOXLATE
@@ -289,7 +291,7 @@
             wl.ToolBar.AddItem(menu);
         }
 
-        static string CreateDebugWatermark(IMapDefinition2 mdf, IServerConnection conn, string layerSc)
+        private static string CreateDebugWatermark(IMapDefinition2 mdf, IServerConnection conn, string layerSc)
         {
             //Tidy up the CS WKT so that it can display nicely in a watermark
             StringBuilder cleanCs = new StringBuilder(mdf.CoordinateSystem);
@@ -331,4 +333,4 @@
             return resId;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpServerConnection.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpServerConnection.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpServerConnection.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,22 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Commands;
 using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
 using OSGeo.MapGuide.MaestroAPI.Exceptions;
@@ -34,7 +37,6 @@
 using OSGeo.MapGuide.ObjectModels.Common;
 using OSGeo.MapGuide.ObjectModels.RuntimeMap;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Diagnostics;
@@ -49,21 +51,22 @@
     /// <summary>
     /// Primary http based connection to the MapGuide Server
     /// </summary>
-    public class HttpServerConnection : MgServerConnectionBase, 
-                                        IServerConnection, 
-                                        IDisposable, 
-                                        IFeatureService, 
-                                        IResourceService, 
-                                        ITileService, 
+    public class HttpServerConnection : MgServerConnectionBase,
+                                        IServerConnection,
+                                        IDisposable,
+                                        IFeatureService,
+                                        IResourceService,
+                                        ITileService,
                                         IMappingService,
                                         IDrawingService,
                                         IFusionService,
                                         ISiteService
     {
-        private RequestBuilder m_reqBuilder;   
-        
+        private RequestBuilder m_reqBuilder;
+
         //These only change after server reboot, so it is probably safe to cache them
         private FeatureProviderRegistry m_featureProviders = null; //SHARED
+
         private Version m_siteVersion; //SHARED
 
         private bool mAnonymousUser = false;
@@ -71,7 +74,6 @@
         internal HttpServerConnection()
             : base()
         {
-            
         }
 
         internal HttpServerConnection(RequestBuilder builder)
@@ -98,7 +100,7 @@
         }
 
         /// <summary>
-        /// Gets whether this connection was initialised with an Anonymous login. If it was, it will return true. 
+        /// Gets whether this connection was initialised with an Anonymous login. If it was, it will return true.
         /// If this was not, or it was initialised from an existing session id, then it will return false.
         /// </summary>
         public bool IsAnonymous
@@ -207,7 +209,7 @@
             if (initParams[PARAM_UNTESTED] != null)
                 bool.TryParse(initParams[PARAM_UNTESTED], out allowUntestedVersion);
 
-            if (initParams[PARAM_SESSION] != null) 
+            if (initParams[PARAM_SESSION] != null)
             {
                 string sessionid = initParams[PARAM_SESSION];
 
@@ -243,7 +245,7 @@
         public override ResourceList GetRepositoryResources(string startingpoint, string type, int depth, bool computeChildren)
         {
             string req = m_reqBuilder.EnumerateResources(startingpoint, depth, type, computeChildren);
-            
+
             //TODO: Cache?
             return (ResourceList)DeserializeObject(typeof(ResourceList), this.OpenRead(req));
         }
@@ -253,7 +255,7 @@
             get
             {
                 string req = m_reqBuilder.GetFeatureProviders();
-                
+
                 lock (SyncRoot)
                 {
                     if (m_featureProviders == null)
@@ -421,43 +423,43 @@
             //Use the old code path if stream is under 50MB (implying seekable too)
             if (stream.CanSeek && stream.Length < 50 * 1024 * 1024)
             {
-    #if DEBUG_LASTMESSAGE
+#if DEBUG_LASTMESSAGE
                 using (System.IO.Stream s = System.IO.File.Open("lastSaveData.bin", System.IO.FileMode.Create, System.IO.FileAccess.Write, System.IO.FileShare.None))
                     Utility.CopyStream(stream, s);
-    #endif
-                    if (stream.CanSeek)
-                        stream.Position = 0;
+#endif
+                if (stream.CanSeek)
+                    stream.Position = 0;
 
-                    System.IO.MemoryStream outStream = new System.IO.MemoryStream();
-    #if DEBUG_LASTMESSAGE
-                try 
+                System.IO.MemoryStream outStream = new System.IO.MemoryStream();
+#if DEBUG_LASTMESSAGE
+                try
                 {
-    #endif
-                    System.Net.WebRequest req = m_reqBuilder.SetResourceData(resourceid, dataname, datatype, outStream, stream, callback);
-                    req.Credentials = _cred;
-                    outStream.Position = 0;
+#endif
+                System.Net.WebRequest req = m_reqBuilder.SetResourceData(resourceid, dataname, datatype, outStream, stream, callback);
+                req.Credentials = _cred;
+                outStream.Position = 0;
 
-                    //TODO: We need a progress bar for the upload....
-                    req.Timeout = 1000 * 60 * 15;
-                    using (System.IO.Stream rs = req.GetRequestStream())
-                    {
-                        Utility.CopyStream(outStream, rs);
-                        rs.Flush();
-                    }
-                    using (System.IO.Stream resp = req.GetResponse().GetResponseStream())
-                    {
-                        //Do nothing... there is no return value
-                    }
-    #if DEBUG_LASTMESSAGE
-                } 
-                catch 
+                //TODO: We need a progress bar for the upload....
+                req.Timeout = 1000 * 60 * 15;
+                using (System.IO.Stream rs = req.GetRequestStream())
                 {
+                    Utility.CopyStream(outStream, rs);
+                    rs.Flush();
+                }
+                using (System.IO.Stream resp = req.GetResponse().GetResponseStream())
+                {
+                    //Do nothing... there is no return value
+                }
+#if DEBUG_LASTMESSAGE
+                }
+                catch
+                {
                     using (System.IO.Stream s = System.IO.File.OpenWrite("lastPost.txt"))
                         Utility.CopyStream(outStream, s);
 
                     throw;
                 }
-    #endif
+#endif
             }
             else
             {
@@ -488,7 +490,7 @@
                 }
             }
         }
-        
+
         //Source: http://stackoverflow.com/questions/566462/upload-files-with-httpwebrequest-multipart-form-data
         private void HttpUploadFile(string url, string file, string paramName, string contentType, NameValueCollection nvc, Utility.StreamCopyProgressDelegate callback)
         {
@@ -589,7 +591,7 @@
 
             System.IO.MemoryStream outStream = new System.IO.MemoryStream();
 #if DEBUG_LASTMESSAGE
-            try 
+            try
             {
 #endif
             //Protect against session expired
@@ -630,8 +632,8 @@
                     throw;
             }
 #if DEBUG_LASTMESSAGE
-            } 
-            catch 
+            }
+            catch
             {
                 if (outStream.CanSeek)
                     outStream.Position = 0;
@@ -647,7 +649,7 @@
             else
                 OnResourceAdded(resourceid);
         }
-        
+
         private void LogResponse(HttpWebResponse resp)
         {
             OnRequestDispatched(string.Format("{0:d} {1} {2} {3}", resp.StatusCode, resp.StatusDescription, resp.Method, GetResponseString(resp)));
@@ -726,11 +728,9 @@
                     throw ex2;
                 else
                     throw;
-
             }
         }
 
-
         public override IReader AggregateQueryFeatureSource(string resourceID, string schema, string filter, string[] columns)
         {
             return QueryFeatureSourceCore(true, resourceID, schema, filter, columns, null);
@@ -769,7 +769,6 @@
                     throw ex2;
                 else
                     throw;
-
             }
         }
 
@@ -859,16 +858,14 @@
 
             using (System.IO.Stream resp = this.OpenRead(req))
                 resp.ReadByte();
-                //Do nothing... there is no return value
+            //Do nothing... there is no return value
 
             OnResourceDeleted(resourceID);
         }
 
-        
-
         public override Version SiteVersion
         {
-            get 
+            get
             {
                 lock (SyncRoot)
                 {
@@ -887,21 +884,22 @@
         }
 
         private ICoordinateSystemCatalog m_coordsys = null;
-        //TODO: Figure out a strategy for cache invalidation 
+
+        //TODO: Figure out a strategy for cache invalidation
         //TODO: Figure out if this can work with MapGuide EP 1.0 (just exclude it?)
-        public ICoordinateSystemCatalog CoordinateSystemCatalog 
-        { 
-            get 
-            { 
+        public ICoordinateSystemCatalog CoordinateSystemCatalog
+        {
+            get
+            {
                 if (this.SiteVersion < OSGeo.MapGuide.MaestroAPI.SiteVersions.GetVersion(OSGeo.MapGuide.MaestroAPI.KnownSiteVersions.MapGuideOS1_1))
                     return null;
                 else
-                {	
+                {
                     if (m_coordsys == null)
                         m_coordsys = new HttpCoordinateSystemCatalog(this, m_reqBuilder);
                     return m_coordsys;
                 }
-            } 
+            }
         }
 
         public System.IO.Stream ExecuteOperation(System.Collections.Specialized.NameValueCollection param)
@@ -914,13 +912,12 @@
         /// </summary>
         public string ServerURI { get { return m_reqBuilder.HostURI; } }
 
-
         /// <summary>
         /// Gets a string that can be used to identify the server by a user
         /// </summary>
         public string DisplayName
         {
-            get 
+            get
             {
                 string s = m_reqBuilder.HostURI;
                 if (s.ToLower().EndsWith("/mapagent/mapagent.fcgi"))
@@ -943,7 +940,6 @@
                 return (ResourceReferenceList)DeserializeObject(typeof(ResourceReferenceList), resp);
         }
 
-
         public override void CopyResource(string oldpath, string newpath, bool overwrite)
         {
             bool exists = ResourceExists(newpath);
@@ -1073,7 +1069,7 @@
 #else
             System.IO.MemoryStream ms = new System.IO.MemoryStream();
             System.Net.WebRequest req = m_reqBuilder.GetMapImage(mapname, format, null, x, y, scale, dpi, width, height, clip, null, null, null, null, ms);
-            
+
             //Maksim reported that the rendering times out frequently, so now we wait 5 minutes
             req.Timeout = 5 * 60 * 1000;
 
@@ -1105,7 +1101,7 @@
 #else
             System.IO.MemoryStream ms = new System.IO.MemoryStream();
             System.Net.WebRequest req = m_reqBuilder.GetMapImage(mapname, format, null, x1, y1, x2, y2, dpi, width, height, clip, null, null, null, null, ms);
-            
+
             //Maksim reported that the rendering times out frequently, so now we wait 5 minutes
             req.Timeout = 5 * 60 * 1000;
 
@@ -1118,7 +1114,7 @@
 
                 if (hwr != null)
                     LogResponse(hwr);
-    
+
                 return resp.GetResponseStream();
             }
 
@@ -1197,12 +1193,11 @@
             else
                 throw new Exception("Unable to parse classname into class and schema: " + classname);
 
-
             XmlDocument doc = new XmlDocument();
             doc.Load(this.OpenRead(req));
             XmlNodeList lst = doc.SelectNodes("/PropertyDefinitions/PropertyDefinition/Name");
             string[] ids = new string[lst.Count];
-            for(int i = 0; i < lst.Count; i++)
+            for (int i = 0; i < lst.Count; i++)
                 ids[i] = lst[i].InnerText;
 
             return ids;
@@ -1263,7 +1258,7 @@
                             ok = true;
                         }
                     }
-                    catch {}
+                    catch { }
 
                     if (!ok)
                     {
@@ -1291,7 +1286,7 @@
                     m_featureProviders = null;
                     m_reqBuilder = reqb;
                 }
-               
+
                 return true;
             }
             catch
@@ -1415,7 +1410,7 @@
         {
             string req = m_reqBuilder.EnumerateUnmanagedData(startpath, filter, recursive, type);
             System.IO.MemoryStream ms = new System.IO.MemoryStream();
-            using(System.IO.Stream s = this.OpenRead(req))
+            using (System.IO.Stream s = this.OpenRead(req))
                 Utility.CopyStream(s, ms);
             ms.Position = 0;
             return (UnmanagedDataList)DeserializeObject(typeof(UnmanagedDataList), ms);
@@ -1424,21 +1419,21 @@
         /// <summary>
         /// Gets the base url, ea.: http://localhost/mapguide/
         /// </summary>
-        public string BaseURL 
-        { 
-            get 
-            { 
+        public string BaseURL
+        {
+            get
+            {
                 string baseurl = this.ServerURI;
                 if (baseurl.ToLower().EndsWith("/mapagent.fcgi"))
                     baseurl = baseurl.Substring(0, baseurl.Length - "mapagent.fcgi".Length);
-            
+
                 if (baseurl.ToLower().EndsWith("/mapagent/"))
                     baseurl = baseurl.Substring(0, baseurl.Length - "mapagent/".Length);
                 else if (baseurl.ToLower().EndsWith("/mapagent"))
                     baseurl = baseurl.Substring(0, baseurl.Length - "mapagent".Length);
 
                 return baseurl;
-            } 
+            }
         }
 
         /// <summary>
@@ -1515,17 +1510,16 @@
                 else
                     throw;
             }
-            
         }
 
         public override object GetFolderOrResourceHeader(string resourceID)
         {
             string req = m_reqBuilder.GetResourceHeader(resourceID);
-            using(System.IO.Stream s = this.OpenRead(req))
-            if (ResourceIdentifier.IsFolderResource(resourceID))
-                return this.DeserializeObject<ResourceFolderHeaderType>(s);
-            else
-                return this.DeserializeObject<ResourceDocumentHeaderType>(s);
+            using (System.IO.Stream s = this.OpenRead(req))
+                if (ResourceIdentifier.IsFolderResource(resourceID))
+                    return this.DeserializeObject<ResourceFolderHeaderType>(s);
+                else
+                    return this.DeserializeObject<ResourceDocumentHeaderType>(s);
         }
 
         /// <summary>
@@ -1585,7 +1579,6 @@
             }
         }
 
-
         #region IDisposable Members
 
         public override void Dispose()
@@ -1597,7 +1590,7 @@
             }
         }
 
-        #endregion
+        #endregion IDisposable Members
 
         public override System.IO.Stream GetTile(string mapdefinition, string baselayergroup, int col, int row, int scaleindex, string format)
         {
@@ -1610,22 +1603,22 @@
         }
 
         /// <summary>
-        /// Gets or sets the agent reported to MapGuide. 
+        /// Gets or sets the agent reported to MapGuide.
         /// Free form text, will appear in the log files.
         /// Default is MapGuide Maestro API
         /// </summary>
         public string UserAgent
         {
-            get 
+            get
             {
                 if (m_reqBuilder != null)
                     return m_reqBuilder.UserAgent;
                 return string.Empty;
             }
-            set 
-            { 
+            set
+            {
                 if (m_reqBuilder != null)
-                    m_reqBuilder.UserAgent = value; 
+                    m_reqBuilder.UserAgent = value;
             }
         }
 
@@ -1661,6 +1654,7 @@
                 case ServiceType.Tile:
                 case ServiceType.Site:
                     return this;
+
                 case ServiceType.Fusion:
                     if (this.SiteVersion >= new Version(2, 0))
                         return this;
@@ -1671,7 +1665,7 @@
 
         public const string PROP_USER_AGENT = "UserAgent";
         public const string PROP_BASE_URL = "BaseUrl";
-       
+
         public override string[] GetCustomPropertyNames()
         {
             return new string[] { PROP_USER_AGENT, PROP_BASE_URL };
@@ -2012,4 +2006,4 @@
             return new HttpResourcePreviewUrlGenerator(m_reqBuilder.HostURI);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/OSGeo.MapGuide.MaestroAPI.Http.csproj	2014-12-25 08:20:40 UTC (rev 8459)
@@ -37,6 +37,8 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\Maestro\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -138,6 +140,13 @@
     <None Include="Resources\TextWatermark.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,9 +1,9 @@
-using System.Reflection;
+using OSGeo.MapGuide.MaestroAPI;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using OSGeo.MapGuide.MaestroAPI;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OSGeo.MapGuide.MaestroAPI.Http")]
@@ -12,8 +12,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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)]
 
@@ -23,5 +23,4 @@
 // This long string is the public key of the maestroapi.key token
 [assembly: InternalsVisibleTo("MaestroAPITests, PublicKey=00240000048000009400000006020000002400005253413100040000010001000f196e7ed5bff1e511efa3251b228582b26cbf78ea6d4282742d5c882db02b08ebc99922c0ddccf9ab79ee180250ac6716f986cf6fabdc1404b3dafee8873d4d6327be301f5ca52862065678cd5bc0c18ddc7ef6516723162c985a0c20eec07382a2090486f24393bf80976aa5ab57274620bafd62dfec34d5eed74bf41e72d2")]
 [assembly: InternalsVisibleTo("MaestroBaseTests, PublicKey=00240000048000009400000006020000002400005253413100040000010001000f196e7ed5bff1e511efa3251b228582b26cbf78ea6d4282742d5c882db02b08ebc99922c0ddccf9ab79ee180250ac6716f986cf6fabdc1404b3dafee8873d4d6327be301f5ca52862065678cd5bc0c18ddc7ef6516723162c985a0c20eec07382a2090486f24393bf80976aa5ab57274620bafd62dfec34d5eed74bf41e72d2")]
-
 [assembly: MaestroApiProvider("Maestro.Http", "Maestro HTTP API", typeof(HttpServerConnection), true, false)]
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/RequestBuilder.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/RequestBuilder.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/RequestBuilder.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
+//
 
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.ObjectModels.Common;
 using System;
 using System.Collections.Specialized;
-using OSGeo.MapGuide.ObjectModels.Common;
-using System.Globalization;
 using System.Drawing;
+using System.Globalization;
 
 namespace OSGeo.MapGuide.MaestroAPI
 {
@@ -46,7 +48,7 @@
         }
 
         internal RequestBuilder(Uri hosturi, string locale)
-            : this (hosturi, locale, null, false)
+            : this(hosturi, locale, null, false)
         {
         }
 
@@ -98,7 +100,6 @@
             if (m_locale != null)
                 param.Add("LOCALE", m_locale);
             return m_hosturi + "?" + EncodeParameters(param);
-
         }
 
         internal string EnumerateResources(string startingpoint, int depth, string type, bool computeChildren)
@@ -154,7 +155,7 @@
 
             param.Add("PROVIDER", providername);
             System.Text.StringBuilder sb = new System.Text.StringBuilder();
-            foreach(string k in parameters)
+            foreach (string k in parameters)
             {
                 sb.Append(k);
                 sb.Append("=");
@@ -174,7 +175,6 @@
             return req;
         }
 
-
         internal string TestConnection(string providername, NameValueCollection parameters)
         {
             if (m_sessionID == null)
@@ -191,7 +191,7 @@
 
             param.Add("PROVIDER", providername);
             System.Text.StringBuilder sb = new System.Text.StringBuilder();
-            foreach(string k in parameters)
+            foreach (string k in parameters)
             {
                 sb.Append(k);
                 sb.Append("=");
@@ -238,7 +238,6 @@
             return System.Web.HttpUtility.UrlEncode(name) + "=" + System.Web.HttpUtility.UrlEncode(value);
         }
 
-
         public string GetMapDWF(string id)
         {
             if (m_sessionID == null)
@@ -317,7 +316,6 @@
             return m_hosturi + "?" + EncodeParameters(param);
         }
 
-
         public string DeleteResourceData(string id, string name)
         {
             if (m_sessionID == null)
@@ -338,7 +336,6 @@
             return m_hosturi + "?" + EncodeParameters(param);
         }
 
-
         public string GetResourceHeader(string id)
         {
             if (m_sessionID == null)
@@ -379,7 +376,7 @@
 
         private void EncodeFormParameters(string boundary, NameValueCollection param, System.IO.Stream responseStream)
         {
-            foreach(string s in param.Keys)
+            foreach (string s in param.Keys)
             {
                 string val = param[s];
                 if (string.IsNullOrEmpty(val))
@@ -412,12 +409,12 @@
                 contenttype = "\r\nContent-Type: application/octet-stream";
             }
 
-            byte[] headers = System.Text.Encoding.UTF8.GetBytes(string.Concat(new String[] { "Content-Disposition: form-data; name=\"" + name + "\";" + filename , "\"", contenttype, "\r\n\r\n"}));
+            byte[] headers = System.Text.Encoding.UTF8.GetBytes(string.Concat(new String[] { "Content-Disposition: form-data; name=\"" + name + "\";" + filename, "\"", contenttype, "\r\n\r\n" }));
             responseStream.Write(headers, 0, headers.Length);
 
             Utility.CopyStream(dataStream, responseStream, callback, 0);
 
-            byte[] footer =  System.Text.Encoding.UTF8.GetBytes("\r\n--" + boundary + "\r\n");
+            byte[] footer = System.Text.Encoding.UTF8.GetBytes("\r\n--" + boundary + "\r\n");
             responseStream.Write(footer, 0, footer.Length);
         }
 
@@ -441,7 +438,7 @@
 
             EncodeFormParameters(boundary, param, outStream);
             if (content != null)
-                AppendFormContent("CONTENT", "content.xml", boundary, outStream, content, null);					
+                AppendFormContent("CONTENT", "content.xml", boundary, outStream, content, null);
             if (header != null)
                 AppendFormContent("HEADER", "header.xml", boundary, outStream, header, null);
 
@@ -492,7 +489,7 @@
             System.Net.WebRequest req = PrepareFormContent(outStream, out boundary);
 
             EncodeFormParameters(boundary, param, outStream);
-            AppendFormContent("DATA", "content.bin", boundary, outStream, content, callback);					
+            AppendFormContent("DATA", "content.bin", boundary, outStream, content, callback);
 
             req.ContentLength = outStream.Length;
             return req;
@@ -511,7 +508,7 @@
 
             param.Add("RESOURCEID", resourceId);
             param.Add("CLASSNAME", classname);
-            
+
             //Using the very standard TAB character for column seperation
             //  ... nice if your data has "," or ";" in the column names :)
             if (columns != null)
@@ -557,7 +554,7 @@
 
             param.Add("RESOURCEID", resourceId);
             param.Add("CLASSNAME", classname);
-            
+
             //Using the very standard TAB character for column seperation
             //  ... nice if your data has "," or ";" in the column names :)
             if (columns != null)
@@ -568,7 +565,7 @@
                 System.Collections.Generic.List<string> keys = new System.Collections.Generic.List<string>();
                 System.Collections.Generic.List<string> values = new System.Collections.Generic.List<string>();
 
-                foreach(string s in computedProperties.Keys)
+                foreach (string s in computedProperties.Keys)
                 {
                     keys.Add(s);
                     values.Add(computedProperties[s]);
@@ -613,7 +610,7 @@
 
             param.Add("RESOURCEID", resourceId);
             param.Add("SCHEMA", schema);
-            
+
             return m_hosturi + "?" + EncodeParameters(param);
         }
 
@@ -649,7 +646,6 @@
             return m_hosturi + "?" + EncodeParameters(param);
         }
 
-
         public string EnumerateCategories()
         {
             NameValueCollection param = new NameValueCollection();
@@ -664,7 +660,6 @@
             return m_hosturi + "?" + EncodeParameters(param);
         }
 
-
         public string EnumerateCoordinateSystems(string category)
         {
             NameValueCollection param = new NameValueCollection();
@@ -697,7 +692,6 @@
             return m_hosturi + "?" + EncodeParameters(param);
         }
 
-
         public string ConvertCoordinateSystemCodeToWkt(string code)
         {
             NameValueCollection param = new NameValueCollection();
@@ -714,7 +708,6 @@
             return m_hosturi + "?" + EncodeParameters(param);
         }
 
-
         public string ConvertWktToEpsgCode(string wkt)
         {
             NameValueCollection param = new NameValueCollection();
@@ -859,7 +852,7 @@
 
             if (selectionXml != null && selectionXml.Length != 0)
                 param.Add("SELECTION", selectionXml);
-            
+
             param.Add("SETVIEWCENTERX", Utility.SerializeDigit(centerX));
             param.Add("SETVIEWCENTERY", Utility.SerializeDigit(centerY));
             param.Add("SETVIEWSCALE", Utility.SerializeDigit(scale));
@@ -928,7 +921,7 @@
 
             return req;
         }
-        
+
         public string BuildRequest(NameValueCollection param)
         {
             return m_hosturi + "?" + EncodeParameters(param);
@@ -941,13 +934,12 @@
             param.Add("VERSION", "1.0.0");
             param.Add("SESSION", m_sessionID);
             param.Add("MAPNAME", mapname);
-            
+
             if (format != null && format.Length != 0)
                 param.Add("FORMAT", format);
 
             if (selectionXml != null && selectionXml.Length != 0)
                 param.Add("SELECTION", selectionXml);
-            
 
             param.Add("SETVIEWCENTERX", Utility.SerializeDigit(centerX));
             param.Add("SETVIEWCENTERY", Utility.SerializeDigit(centerY));
@@ -987,7 +979,6 @@
             if (selectionXml != null && selectionXml.Length != 0)
                 param.Add("SELECTION", selectionXml);
 
-
             param.Add("SETDATAEXTENT", Utility.SerializeDigit(x1) + ", " + Utility.SerializeDigit(y1) + ", " + Utility.SerializeDigit(x2) + ", " + Utility.SerializeDigit(y2));
             param.Add("SETDISPLAYDPI", dpi.ToString());
             param.Add("SETDISPLAYWIDTH", width.ToString());
@@ -1080,7 +1071,7 @@
 
             if (m_locale != null)
                 param.Add("LOCALE", m_locale);
-            
+
             return m_hosturi + "?" + EncodeParameters(param);
         }
 
@@ -1095,7 +1086,7 @@
 
             if (m_locale != null)
                 param.Add("LOCALE", m_locale);
-            
+
             return m_hosturi + "?" + EncodeParameters(param);
         }
 
@@ -1110,7 +1101,7 @@
 
             if (m_locale != null)
                 param.Add("LOCALE", m_locale);
-            
+
             return m_hosturi + "?" + EncodeParameters(param);
         }
 
@@ -1127,7 +1118,7 @@
 
             if (m_locale != null)
                 param.Add("LOCALE", m_locale);
-            
+
             return m_hosturi + "?" + EncodeParameters(param);
         }
 
@@ -1147,7 +1138,7 @@
 
             if (m_locale != null)
                 param.Add("LOCALE", m_locale);
-            
+
             return m_hosturi + "?" + EncodeParameters(param);
         }
 
@@ -1173,7 +1164,7 @@
 
             if (m_locale != null)
                 param.Add("LOCALE", m_locale);
-            
+
             return m_hosturi + "?" + EncodeParameters(param);
         }
 
@@ -1786,4 +1777,4 @@
             return m_hosturi + "?" + EncodeParameters(param);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlDataReader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlDataReader.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlDataReader.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,38 +1,42 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Feature;
 using System.IO;
-using OSGeo.MapGuide.MaestroAPI.Feature;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 using System.Net;
 
 namespace OSGeo.MapGuide.MaestroAPI.Http
 {
     public class XmlDataReader : XmlReaderBase
     {
-        internal XmlDataReader(Stream stream) : base(stream) { }
+        internal XmlDataReader(Stream stream)
+            : base(stream)
+        {
+        }
 
-        public XmlDataReader(HttpWebResponse resp) : base(resp) { }
+        public XmlDataReader(HttpWebResponse resp)
+            : base(resp)
+        {
+        }
 
         public override ReaderType ReaderType
         {
@@ -89,4 +93,4 @@
             get { return "PropertySet"; }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlFeatureReader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlFeatureReader.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlFeatureReader.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,38 +1,42 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Feature;
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using System.Xml;
+using System.Diagnostics;
 using System.IO;
-using OSGeo.MapGuide.MaestroAPI.Feature;
-using OSGeo.MapGuide.MaestroAPI.Http;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using System.Diagnostics;
 using System.Net;
+using System.Xml;
 
 namespace OSGeo.MapGuide.MaestroAPI.Http
 {
     public class XmlFeatureReader : XmlReaderBase, IFeatureReader
     {
-        internal XmlFeatureReader(Stream stream) : base(stream) { }
+        internal XmlFeatureReader(Stream stream)
+            : base(stream)
+        {
+        }
 
         public XmlFeatureReader(HttpWebResponse resp)
             : base(resp)
@@ -91,6 +95,7 @@
                 {
                     case PropertyDefinitionType.Association:
                         break;
+
                     case PropertyDefinitionType.Data:
                         {
                             DataPropertyDefinition dp = (DataPropertyDefinition)prop;
@@ -99,49 +104,62 @@
                                 case DataPropertyType.Blob:
                                     properties.Add(new XmlProperty(name, PropertyValueType.Blob));
                                     break;
+
                                 case DataPropertyType.Boolean:
                                     properties.Add(new XmlProperty(name, PropertyValueType.Boolean));
                                     break;
+
                                 case DataPropertyType.Byte:
                                     properties.Add(new XmlProperty(name, PropertyValueType.Byte));
                                     break;
+
                                 case DataPropertyType.Clob:
                                     properties.Add(new XmlProperty(name, PropertyValueType.Clob));
                                     break;
+
                                 case DataPropertyType.DateTime:
                                     properties.Add(new XmlProperty(name, PropertyValueType.DateTime));
                                     break;
+
                                 case DataPropertyType.Double:
                                     properties.Add(new XmlProperty(name, PropertyValueType.Double));
                                     break;
+
                                 case DataPropertyType.Int16:
                                     properties.Add(new XmlProperty(name, PropertyValueType.Int16));
                                     break;
+
                                 case DataPropertyType.Int32:
                                     properties.Add(new XmlProperty(name, PropertyValueType.Int32));
                                     break;
+
                                 case DataPropertyType.Int64:
                                     properties.Add(new XmlProperty(name, PropertyValueType.Int64));
                                     break;
+
                                 case DataPropertyType.Single:
                                     properties.Add(new XmlProperty(name, PropertyValueType.Single));
                                     break;
+
                                 case DataPropertyType.String:
                                     properties.Add(new XmlProperty(name, PropertyValueType.String));
                                     break;
                             }
                         }
                         break;
+
                     case PropertyDefinitionType.Geometry:
                         {
                             properties.Add(new XmlProperty(name, PropertyValueType.Geometry));
                         }
                         break;
+
                     case PropertyDefinitionType.Object:
                         {
                             properties.Add(new XmlProperty(name, PropertyValueType.Feature));
                         }
                         break;
+
                     case PropertyDefinitionType.Raster:
                         {
                             properties.Add(new XmlProperty(name, PropertyValueType.Raster));
@@ -245,11 +263,14 @@
             }
         }
 
-        class Enumerator : IEnumerator<IFeature>
+        private class Enumerator : IEnumerator<IFeature>
         {
             private XmlFeatureReader _reader;
 
-            public Enumerator(XmlFeatureReader reader) { _reader = reader; }
+            public Enumerator(XmlFeatureReader reader)
+            {
+                _reader = reader;
+            }
 
             public IFeature Current
             {
@@ -258,7 +279,6 @@
 
             public void Dispose()
             {
-                
             }
 
             object System.Collections.IEnumerator.Current
@@ -287,4 +307,4 @@
             return new Enumerator(this);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlReaderBase.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlReaderBase.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlReaderBase.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,33 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Feature;
+using OSGeo.MapGuide.MaestroAPI.Internal;
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Feature;
 using System.IO;
+using System.Net;
 using System.Xml;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.MaestroAPI.Internal;
-using System.Net;
 
 namespace OSGeo.MapGuide.MaestroAPI.Http
 {
@@ -67,7 +69,7 @@
             InitCommon(stream);
         }
 
-        public XmlReaderBase(HttpWebResponse resp) 
+        public XmlReaderBase(HttpWebResponse resp)
         {
             _resp = resp;
             try
@@ -138,8 +140,6 @@
                 if (_reader.Name != this.DefinitionChildTypeElement)
                     throw new Exception("Bad document. Expected element: " + this.DefinitionChildTypeElement);
                 string type = _reader.ReadInnerXml();
-
-               
             }*/
 
             _properties = properties.ToArray();
@@ -206,34 +206,46 @@
                 case "bool":
                 case "boolean":
                     return PropertyValueType.Boolean;
+
                 case "blob":
                     return PropertyValueType.Blob;
+
                 case "byte":
                     return PropertyValueType.Byte;
+
                 case "clob":
                     return PropertyValueType.Clob;
+
                 case "double":
                 case "decimal":
                     return PropertyValueType.Double;
+
                 case "date":
                 case "datetime":
                     return PropertyValueType.DateTime;
+
                 case "geometry":
                     return PropertyValueType.Geometry;
+
                 case "int":
                 case "int32":
                 case "integer":
                     return PropertyValueType.Int32;
+
                 case "int16":
                     return PropertyValueType.Int16;
+
                 case "int64":
                 case "long":
                     return PropertyValueType.Int64;
+
                 case "raster":
                     return PropertyValueType.Raster;
+
                 case "float":
                 case "single":
                     return PropertyValueType.Single;
+
                 case "string":
                     return PropertyValueType.String;
             }
@@ -255,9 +267,9 @@
 
                 _recDoc.LoadXml(_reader.ReadOuterXml());
                 var rec = new XmlRecord(_properties, _wktReader, _recDoc[this.ValuesRowElement].SelectNodes(this.ValuesRowPropertyElement), this.ValuesRowPropertyNameElement, this.ValuesRowPropertyValueElement);
-                
+
                 return rec;
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlRecord.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlRecord.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/XmlRecord.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,43 +1,45 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Feature;
+using OSGeo.MapGuide.MaestroAPI.Internal;
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using System;
-using System.Collections.Generic;
 using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Feature;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 using System.Xml;
-using OSGeo.MapGuide.MaestroAPI.Internal;
 
 namespace OSGeo.MapGuide.MaestroAPI.Http
 {
     public class XmlProperty
     {
-        public XmlProperty(string name, PropertyValueType pvtype) 
-        { 
-            this.Name =name;
+        public XmlProperty(string name, PropertyValueType pvtype)
+        {
+            this.Name = name;
             this.Type = pvtype;
         }
 
         public string Name { get; private set; }
 
-        public PropertyValueType Type { get; private set; } 
+        public PropertyValueType Type { get; private set; }
     }
 
     public class XmlRecord : RecordBase
@@ -54,42 +56,55 @@
                     case PropertyValueType.Blob:
                         _values[name] = new BlobValue();
                         break;
+
                     case PropertyValueType.Boolean:
                         _values[name] = new BooleanValue();
                         break;
+
                     case PropertyValueType.Byte:
                         _values[name] = new ByteValue();
                         break;
+
                     case PropertyValueType.Clob:
                         _values[name] = new ClobValue();
                         break;
+
                     case PropertyValueType.DateTime:
                         _values[name] = new DateTimeValue();
                         break;
+
                     case PropertyValueType.Double:
                         _values[name] = new DoubleValue();
                         break;
+
                     case PropertyValueType.Feature:
                         _values[name] = new FeatureValue();
                         break;
+
                     case PropertyValueType.Geometry:
                         _values[name] = new GeometryValue();
                         break;
+
                     case PropertyValueType.Int16:
                         _values[name] = new Int16Value();
                         break;
+
                     case PropertyValueType.Int32:
                         _values[name] = new Int32Value();
                         break;
+
                     case PropertyValueType.Int64:
                         _values[name] = new Int64Value();
                         break;
+
                     case PropertyValueType.Raster:
                         _values[name] = new RasterValue();
                         break;
+
                     case PropertyValueType.Single:
                         _values[name] = new SingleValue();
                         break;
+
                     case PropertyValueType.String:
                         _values[name] = new StringValue();
                         break;
@@ -108,44 +123,57 @@
                         case PropertyValueType.Blob:
                             ((BlobValue)_values[name]).Value = Encoding.UTF8.GetBytes(value);
                             break;
+
                         case PropertyValueType.Boolean:
                             ((BooleanValue)_values[name]).Value = XmlConvert.ToBoolean(value);
                             break;
+
                         case PropertyValueType.Byte:
                             ((ByteValue)_values[name]).Value = XmlConvert.ToByte(value);
                             break;
+
                         case PropertyValueType.Clob:
                             ((ClobValue)_values[name]).Value = value.ToCharArray();
                             break;
+
                         case PropertyValueType.DateTime:
                             var dt = ConvertToDateTime(value);
                             if (dt.HasValue)
                                 ((DateTimeValue)_values[name]).Value = dt.Value;
                             break;
+
                         case PropertyValueType.Double:
                             ((DoubleValue)_values[name]).Value = XmlConvert.ToDouble(value);
                             break;
+
                         case PropertyValueType.Feature:
                             ((FeatureValue)_values[name]).Value = ConvertToFeatures(value);
                             break;
+
                         case PropertyValueType.Geometry:
                             ((GeometryValue)_values[name]).Value = wktReader.Read(value);
                             break;
+
                         case PropertyValueType.Int16:
                             ((Int16Value)_values[name]).Value = XmlConvert.ToInt16(value);
                             break;
+
                         case PropertyValueType.Int32:
                             ((Int32Value)_values[name]).Value = XmlConvert.ToInt32(value);
                             break;
+
                         case PropertyValueType.Int64:
                             ((Int64Value)_values[name]).Value = XmlConvert.ToInt64(value);
                             break;
+
                         case PropertyValueType.Raster:
                             ((RasterValue)_values[name]).Value = ConvertToRaster(value);
                             break;
+
                         case PropertyValueType.Single:
                             ((SingleValue)_values[name]).Value = XmlConvert.ToSingle(value);
                             break;
+
                         case PropertyValueType.String:
                             ((StringValue)_values[name]).Value = value;
                             break;
@@ -197,4 +225,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalCapabilities.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalCapabilities.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalCapabilities.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,37 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Services;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Capability;
 using OSGeo.MapGuide.MaestroAPI.Commands;
+using System;
 
 namespace OSGeo.MapGuide.MaestroAPI.Local
 {
     public class LocalCapabilities : ConnectionCapabilities
     {
-        internal LocalCapabilities(IServerConnection parent) : base(parent) { }
+        internal LocalCapabilities(IServerConnection parent)
+            : base(parent)
+        {
+        }
 
         public override int[] SupportedCommands
         {
@@ -37,7 +40,7 @@
                 if (_parent.SiteVersion >= new Version(2, 2))
                 {
                     //TODO: Work out what this can/can't do
-                    return new int[] 
+                    return new int[]
                     {
                         (int)CommandType.GetResourceContents
                     };
@@ -45,7 +48,7 @@
                 else
                 {
                     //TODO: Work out what this can/can't do
-                    return new int[] 
+                    return new int[]
                     {
                     };
                 }
@@ -108,4 +111,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,44 +1,46 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.MaestroAPI.Native;
-using System.Collections.Specialized;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.MaestroAPI.Resource;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Commands;
+using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
 using OSGeo.MapGuide.MaestroAPI.Exceptions;
 using OSGeo.MapGuide.MaestroAPI.Feature;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using System.IO;
-using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
-using System.Diagnostics;
 using OSGeo.MapGuide.MaestroAPI.Local.Commands;
-using OSGeo.MapGuide.MaestroAPI.Commands;
 using OSGeo.MapGuide.MaestroAPI.Mapping;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using OSGeo.MapGuide.MaestroAPI.Native;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels.Capabilities;
+using OSGeo.MapGuide.ObjectModels.Common;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.ObjectModels.Capabilities;
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.Local
 {
@@ -59,7 +61,8 @@
 
         private MgdServiceFactory _fact;
 
-        protected LocalConnection(NameValueCollection initParams) : base()
+        protected LocalConnection(NameValueCollection initParams)
+            : base()
         {
             _fact = new MgdServiceFactory();
             _sessionId = Guid.NewGuid().ToString();
@@ -79,12 +82,16 @@
             {
                 case CommandType.ApplySchema:
                     return new LocalNativeApplySchema(this);
+
                 case CommandType.CreateDataStore:
                     return new LocalNativeCreateDataStore(this);
+
                 case CommandType.DeleteFeatures:
                     return new LocalNativeDelete(this);
+
                 case CommandType.InsertFeature:
                     return new LocalNativeInsert(this);
+
                 case CommandType.UpdateFeatures:
                     return new LocalNativeUpdate(this);
             }
@@ -100,7 +107,7 @@
 
         public override System.Collections.Specialized.NameValueCollection CloneParameters
         {
-            get 
+            get
             {
                 return new NameValueCollection()
                 {
@@ -125,7 +132,7 @@
         }
 
         private string _configFile;
-        const string PARAM_CONFIG = "ConfigFile";
+        private const string PARAM_CONFIG = "ConfigFile";
 
         private MgdResourceService _resSvc;
         private MgdFeatureService _featSvc;
@@ -251,7 +258,7 @@
             if (type == null)
                 type = "";
             var res = GetResourceService();
-            GetByteReaderMethod fetch = () => 
+            GetByteReaderMethod fetch = () =>
             {
                 MgResourceIdentifier resId = new MgResourceIdentifier(startingpoint);
                 return res.EnumerateResources(resId, depth, type, computeChildren);
@@ -334,7 +341,7 @@
         {
             var res = GetResourceService();
             //var result = Native.Utility.MgStreamToNetStream(res, res.GetType().GetMethod("GetResourceData"), new object[] { new MgResourceIdentifier(resourceID), dataname });
-            GetByteReaderMethod fetch = () => 
+            GetByteReaderMethod fetch = () =>
             {
                 MgResourceIdentifier resId = new MgResourceIdentifier(resourceID);
                 return res.GetResourceData(resId, dataname);
@@ -343,7 +350,7 @@
             return new MgReadOnlyStream(fetch);
         }
 
-        const int MAX_INPUT_STREAM_SIZE_MB = 30;
+        private const int MAX_INPUT_STREAM_SIZE_MB = 30;
 
         public override void SetResourceData(string resourceid, string dataname, ResourceDataType datatype, System.IO.Stream stream, Utility.StreamCopyProgressDelegate callback)
         {
@@ -476,7 +483,7 @@
 
         public override FeatureProviderRegistryFeatureProvider[] FeatureProviders
         {
-            get 
+            get
             {
                 MgFeatureService fes = GetFeatureService();
                 GetByteReaderMethod fetch = () =>
@@ -940,7 +947,7 @@
 
         public OSGeo.MapGuide.MaestroAPI.CoordinateSystem.ICoordinateSystemCatalog CoordinateSystemCatalog
         {
-            get 
+            get
             {
                 if (m_coordsys == null)
                     m_coordsys = new LocalNativeCoordinateSystemCatalog();
@@ -955,7 +962,6 @@
 
         public void RestartSession()
         {
-            
         }
 
         public bool RestartSession(bool throwException)
@@ -1336,7 +1342,7 @@
             {
                 xml = sr.ReadToEnd();
             }
-            
+
             impl.Selection.LoadXml(xml);
 
             return xml;
@@ -1364,7 +1370,7 @@
         }
     }
 
-    class LocalLongTransaction : ILongTransaction
+    internal class LocalLongTransaction : ILongTransaction
     {
         public LocalLongTransaction(MgLongTransactionReader rdr)
         {
@@ -1413,7 +1419,7 @@
         }
     }
 
-    class LocalLongTransactionList : ILongTransactionList
+    internal class LocalLongTransactionList : ILongTransactionList
     {
         private List<LocalLongTransaction> _transactions;
 
@@ -1432,5 +1438,4 @@
             get { return _transactions; }
         }
     }
-
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalRuntimeMap.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalRuntimeMap.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalRuntimeMap.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,32 +1,32 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Mapping;
-using System.Drawing;
+using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels.Common;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.ObjectModels.Common;
+using System;
+using System.Drawing;
 
 namespace OSGeo.MapGuide.MaestroAPI.Local
 {
@@ -41,8 +41,9 @@
         private MgdMap _impl;
         private LocalConnection _conn;
 
-        public LocalRuntimeMap(LocalConnection conn, MgdMap map, bool suppressErrors) : base(conn)
-        { 
+        public LocalRuntimeMap(LocalConnection conn, MgdMap map, bool suppressErrors)
+            : base(conn)
+        {
             _impl = map;
             _conn = conn;
             InitializeLayersAndGroups(suppressErrors);
@@ -94,7 +95,7 @@
             {
                 this.Groups.Add(new LocalRuntimeMapGroup(this, groups.GetItem(i)));
             }
-            
+
             //Then layers
             for (int i = 0; i < layers.GetCount(); i++)
             {
@@ -310,20 +311,28 @@
             this.IsDirty = false;
         }
 
-        public MgdMap GetWrappedInstance() { return _impl; }
+        public MgdMap GetWrappedInstance()
+        {
+            return _impl;
+        }
 
         public override void Deserialize(Serialization.MgBinaryDeserializer d)
         {
-            
         }
 
         public override void Serialize(Serialization.MgBinarySerializer s)
         {
-            
         }
 
-        internal void ResetDirtyState() { this.IsDirty = false; }
-        internal void MakeDirty() { this.IsDirty = true; }
+        internal void ResetDirtyState()
+        {
+            this.IsDirty = false;
+        }
+
+        internal void MakeDirty()
+        {
+            this.IsDirty = true;
+        }
     }
 
     internal class LocalRuntimeMapGroup : RuntimeMapGroup
@@ -331,7 +340,8 @@
         private LocalRuntimeMap _parent;
         private MgLayerGroup _impl;
 
-        public LocalRuntimeMapGroup(LocalRuntimeMap parent, MgLayerGroup group) : base(parent, "")
+        public LocalRuntimeMapGroup(LocalRuntimeMap parent, MgLayerGroup group)
+            : base(parent, "")
         {
             _parent = parent;
             _impl = group;
@@ -453,16 +463,17 @@
             }
         }
 
-        internal MgLayerGroup GetWrappedInstance() { return _impl; }
+        internal MgLayerGroup GetWrappedInstance()
+        {
+            return _impl;
+        }
 
         public override void Deserialize(Serialization.MgBinaryDeserializer d)
         {
-            
         }
 
         public override void Serialize(Serialization.MgBinarySerializer s)
         {
-            
         }
     }
 
@@ -471,7 +482,8 @@
         private LocalRuntimeMap _parent;
         private MgLayerBase _impl;
 
-        internal LocalRuntimeMapLayer(LocalRuntimeMap parent, MgLayerBase layer, IResourceService resSvc, bool suppressErrors) : base(parent)
+        internal LocalRuntimeMapLayer(LocalRuntimeMap parent, MgLayerBase layer, IResourceService resSvc, bool suppressErrors)
+            : base(parent)
         {
             _parent = parent;
             _impl = layer;
@@ -660,16 +672,17 @@
             }
         }
 
-        internal MgLayerBase GetWrappedInstance() { return _impl; }
+        internal MgLayerBase GetWrappedInstance()
+        {
+            return _impl;
+        }
 
         public override void Serialize(Serialization.MgBinarySerializer s)
         {
-            
         }
 
         public override void Deserialize(Serialization.MgBinaryDeserializer d)
         {
-            
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,10 +1,9 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Local;
+using System.Reflection;
+using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OSGeo.MapGuide.MaestroAPI.Local")]
@@ -13,12 +12,11 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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("1a33e84e-0180-4b3f-bae5-51b1a62f6bd1")]
-
 [assembly: MaestroApiProvider("Maestro.Local", "Maestro connection wrapper for mg-desktop library", typeof(LocalConnection), true, true)]
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/packages.config
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/packages.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/packages.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="mapguide-api-base-x86" version="2.5.2.7949" targetFramework="net40-Client" />
-  <package id="mg-desktop-net40-x86" version="2.5.2.7949" targetFramework="net40-Client" />
+    <package id="mapguide-api-base-x86" version="2.5.2.7949" targetFramework="net40-Client" />
+    <package id="mg-desktop-net40-x86" version="2.5.2.7949" targetFramework="net40-Client" />
 </packages>
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Commands/FeatureCommandsImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Commands/FeatureCommandsImpl.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Commands/FeatureCommandsImpl.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,37 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using GeoAPI.Geometries;
 using OSGeo.MapGuide.MaestroAPI.Commands;
-using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.MaestroAPI.Feature;
 using OSGeo.MapGuide.MaestroAPI.Internal;
-using GeoAPI.Geometries;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using System;
 
 #if LOCAL_API
+
 namespace OSGeo.MapGuide.MaestroAPI.Local.Commands
 #else
+
 namespace OSGeo.MapGuide.MaestroAPI.Native.Commands
 #endif
 {
@@ -42,9 +45,20 @@
         //    http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dncscol/html/csharp07192001.asp
         //
 
-        public FeatureServiceException() { }
-        public FeatureServiceException(string message) : base(message) { }
-        public FeatureServiceException(string message, Exception inner) : base(message, inner) { }
+        public FeatureServiceException()
+        {
+        }
+
+        public FeatureServiceException(string message)
+            : base(message)
+        {
+        }
+
+        public FeatureServiceException(string message, Exception inner)
+            : base(message, inner)
+        {
+        }
+
         protected FeatureServiceException(
           System.Runtime.Serialization.SerializationInfo info,
           System.Runtime.Serialization.StreamingContext context)
@@ -57,9 +71,9 @@
 
     internal static class GeomConverter
     {
-        static MgAgfReaderWriter _agfRw;
-        static MgWktReaderWriter _wktRw;
-        static FixedWKTReader _reader;
+        private static MgAgfReaderWriter _agfRw;
+        private static MgWktReaderWriter _wktRw;
+        private static FixedWKTReader _reader;
 
         static GeomConverter()
         {
@@ -82,7 +96,7 @@
         public static IGeometry GetGeometry(MgByteReader agf)
         {
             MgGeometry mgeom = _agfRw.Read(agf);
-            return _reader.Read(GetWkt(mgeom));   
+            return _reader.Read(GetWkt(mgeom));
         }
     }
 
@@ -113,23 +127,27 @@
                                 ((MgBlobProperty)p).SetValue(bs.GetReader());
                             }
                             break;
+
                         case MgPropertyType.Boolean:
                             {
                                 ((MgBooleanProperty)p).SetValue(record.GetBoolean(name));
                             }
                             break;
+
                         case MgPropertyType.Byte:
                             {
                                 ((MgByteProperty)p).SetValue(record.GetByte(name));
                             }
                             break;
+
                         case MgPropertyType.Clob:
                             {
                                 var bytes = record.GetBlob(name);
                                 var bs = new MgByteSource(bytes, bytes.Length);
-                                ((MgClobProperty)p).SetValue(bs.GetReader()); 
+                                ((MgClobProperty)p).SetValue(bs.GetReader());
                             }
                             break;
+
                         case MgPropertyType.DateTime:
                             {
                                 var dt = record.GetDateTime(i);
@@ -137,43 +155,51 @@
                                 ((MgDateTimeProperty)p).SetValue(mdt);
                             }
                             break;
+
                         case MgPropertyType.Decimal:
                         case MgPropertyType.Double:
                             {
                                 ((MgDoubleProperty)p).SetValue(record.GetDouble(name));
                             }
                             break;
+
                         case MgPropertyType.Geometry:
                             {
                                 var agf = GeomConverter.GetAgf(record.GetGeometry(name));
                                 ((MgGeometryProperty)p).SetValue(agf);
                             }
                             break;
+
                         case MgPropertyType.Int16:
                             {
                                 ((MgInt16Property)p).SetValue(record.GetInt16(name));
                             }
                             break;
+
                         case MgPropertyType.Int32:
                             {
                                 ((MgInt32Property)p).SetValue(record.GetInt32(name));
                             }
                             break;
+
                         case MgPropertyType.Int64:
                             {
                                 ((MgInt64Property)p).SetValue(record.GetInt64(name));
                             }
                             break;
+
                         case MgPropertyType.Single:
                             {
                                 ((MgSingleProperty)p).SetValue(record.GetSingle(name));
                             }
                             break;
+
                         case MgPropertyType.String:
                             {
                                 ((MgStringProperty)p).SetValue(record.GetString(name));
                             }
                             break;
+
                         default:
                             throw new NotSupportedException();
                     }
@@ -198,6 +224,7 @@
                                 props.Add(propVal);
                             }
                             break;
+
                         case PropertyValueType.Boolean:
                             {
                                 var propVal = new MgBooleanProperty(name, false);
@@ -205,6 +232,7 @@
                                 props.Add(propVal);
                             }
                             break;
+
                         case PropertyValueType.Byte:
                             {
                                 var propVal = new MgByteProperty(name, 0);
@@ -212,6 +240,7 @@
                                 props.Add(propVal);
                             }
                             break;
+
                         case PropertyValueType.Clob:
                             {
                                 var propVal = new MgClobProperty(name, null);
@@ -219,6 +248,7 @@
                                 props.Add(propVal);
                             }
                             break;
+
                         case PropertyValueType.DateTime:
                             {
                                 var propVal = new MgDateTimeProperty(name, null);
@@ -226,6 +256,7 @@
                                 props.Add(propVal);
                             }
                             break;
+
                         case PropertyValueType.Double:
                             {
                                 var propVal = new MgDoubleProperty(name, 0.0);
@@ -233,6 +264,7 @@
                                 props.Add(propVal);
                             }
                             break;
+
                         case PropertyValueType.Geometry:
                             {
                                 var propVal = new MgGeometryProperty(name, null);
@@ -240,6 +272,7 @@
                                 props.Add(propVal);
                             }
                             break;
+
                         case PropertyValueType.Int16:
                             {
                                 var propVal = new MgInt16Property(name, 0);
@@ -247,6 +280,7 @@
                                 props.Add(propVal);
                             }
                             break;
+
                         case PropertyValueType.Int32:
                             {
                                 var propVal = new MgInt32Property(name, 0);
@@ -254,6 +288,7 @@
                                 props.Add(propVal);
                             }
                             break;
+
                         case PropertyValueType.Int64:
                             {
                                 var propVal = new MgInt64Property(name, 0L);
@@ -261,6 +296,7 @@
                                 props.Add(propVal);
                             }
                             break;
+
                         case PropertyValueType.Single:
                             {
                                 var propVal = new MgSingleProperty(name, 0.0f);
@@ -268,6 +304,7 @@
                                 props.Add(propVal);
                             }
                             break;
+
                         case PropertyValueType.String:
                             {
                                 var propVal = new MgStringProperty(name, "");
@@ -275,6 +312,7 @@
                                 props.Add(propVal);
                             }
                             break;
+
                         default:
                             throw new NotSupportedException();
                     }
@@ -291,16 +329,19 @@
                                 props.Add(bv);
                             }
                             break;
+
                         case PropertyValueType.Boolean:
                             {
                                 props.Add(new MgBooleanProperty(name, record.GetBoolean(i)));
                             }
                             break;
+
                         case PropertyValueType.Byte:
                             {
                                 props.Add(new MgByteProperty(name, record.GetByte(i)));
                             }
                             break;
+
                         case PropertyValueType.Clob:
                             {
                                 var bytes = record.GetBlob(i);
@@ -309,6 +350,7 @@
                                 props.Add(bv);
                             }
                             break;
+
                         case PropertyValueType.DateTime:
                             {
                                 var dt = record.GetDateTime(i);
@@ -316,42 +358,50 @@
                                 props.Add(new MgDateTimeProperty(name, mdt));
                             }
                             break;
+
                         case PropertyValueType.Double:
                             {
                                 props.Add(new MgDoubleProperty(name, record.GetDouble(i)));
                             }
                             break;
+
                         case PropertyValueType.Geometry:
                             {
                                 MgByteReader agf = GeomConverter.GetAgf(record.GetGeometry(i));
                                 props.Add(new MgGeometryProperty(name, agf));
                             }
                             break;
+
                         case PropertyValueType.Int16:
                             {
                                 props.Add(new MgInt16Property(name, record.GetInt16(i)));
                             }
                             break;
+
                         case PropertyValueType.Int32:
                             {
                                 props.Add(new MgInt32Property(name, record.GetInt32(i)));
                             }
                             break;
+
                         case PropertyValueType.Int64:
                             {
                                 props.Add(new MgInt64Property(name, record.GetInt64(i)));
                             }
                             break;
+
                         case PropertyValueType.Single:
                             {
                                 props.Add(new MgSingleProperty(name, record.GetSingle(i)));
                             }
                             break;
+
                         case PropertyValueType.String:
                             {
                                 props.Add(new MgStringProperty(name, record.GetString(i)));
                             }
                             break;
+
                         default:
                             throw new NotSupportedException();
                     }
@@ -396,6 +446,7 @@
                                     idProps.Add(dp);
                             }
                             break;
+
                         case PropertyDefinitionType.Geometry:
                             {
                                 var gp = new MgGeometricPropertyDefinition(prop.Name);
@@ -410,6 +461,7 @@
                                 clsProps.Add(gp);
                             }
                             break;
+
                         case PropertyDefinitionType.Raster:
                             {
                                 var rp = new MgRasterPropertyDefinition(prop.Name);
@@ -424,6 +476,7 @@
                                 clsProps.Add(rp);
                             }
                             break;
+
                         default:
                             throw new NotSupportedException();
                     }
@@ -437,14 +490,25 @@
     }
 
 #if LOCAL_API
+
     public class LocalNativeInsert : DefaultInsertCommand<LocalConnection>
     {
-        internal LocalNativeInsert(LocalConnection conn) : base(conn) { }
+        internal LocalNativeInsert(LocalConnection conn)
+            : base(conn)
+        {
+        }
+
 #else
+
     public class LocalNativeInsert : DefaultInsertCommand<LocalNativeConnection>
     {
-        internal LocalNativeInsert(LocalNativeConnection conn) : base(conn) { }
+        internal LocalNativeInsert(LocalNativeConnection conn)
+            : base(conn)
+        {
+        }
+
 #endif
+
         protected override void ExecuteInternal()
         {
             MgPropertyCollection props = new MgPropertyCollection();
@@ -454,13 +518,23 @@
     }
 
 #if LOCAL_API
+
     public class LocalNativeUpdate : DefaultUpdateCommand<LocalConnection>
     {
-        internal LocalNativeUpdate(LocalConnection conn) : base(conn) { }
+        internal LocalNativeUpdate(LocalConnection conn)
+            : base(conn)
+        {
+        }
+
 #else
+
     public class LocalNativeUpdate : DefaultUpdateCommand<LocalNativeConnection>
     {
-        internal LocalNativeUpdate(LocalNativeConnection conn) : base(conn) { }
+        internal LocalNativeUpdate(LocalNativeConnection conn)
+            : base(conn)
+        {
+        }
+
 #endif
 
         public override int ExecuteInternal()
@@ -472,13 +546,23 @@
     }
 
 #if LOCAL_API
+
     public class LocalNativeDelete : DefaultDeleteCommand<LocalConnection>
     {
-        internal LocalNativeDelete(LocalConnection conn) : base(conn) { }
+        internal LocalNativeDelete(LocalConnection conn)
+            : base(conn)
+        {
+        }
+
 #else
+
     public class LocalNativeDelete : DefaultDeleteCommand<LocalNativeConnection>
     {
-        internal LocalNativeDelete(LocalNativeConnection conn) : base(conn) { }
+        internal LocalNativeDelete(LocalNativeConnection conn)
+            : base(conn)
+        {
+        }
+
 #endif
 
         protected override int ExecuteInternal()
@@ -488,13 +572,23 @@
     }
 
 #if LOCAL_API
+
     public class LocalNativeApplySchema : DefaultApplySchemaCommand<LocalConnection>
     {
-        internal LocalNativeApplySchema(LocalConnection conn) : base(conn) { }
+        internal LocalNativeApplySchema(LocalConnection conn)
+            : base(conn)
+        {
+        }
+
 #else
+
     public class LocalNativeApplySchema : DefaultApplySchemaCommand<LocalNativeConnection>
     {
-        internal LocalNativeApplySchema(LocalNativeConnection conn) : base(conn) { }
+        internal LocalNativeApplySchema(LocalNativeConnection conn)
+            : base(conn)
+        {
+        }
+
 #endif
 
         protected override void ExecuteInternal()
@@ -505,14 +599,25 @@
     }
 
 #if LOCAL_API
+
     public class LocalNativeCreateDataStore : DefaultCreateDataStoreCommand<LocalConnection>
     {
-        internal LocalNativeCreateDataStore(LocalConnection conn) : base(conn) { }
+        internal LocalNativeCreateDataStore(LocalConnection conn)
+            : base(conn)
+        {
+        }
+
 #else
+
     public class LocalNativeCreateDataStore : DefaultCreateDataStoreCommand<LocalNativeConnection>
     {
-        internal LocalNativeCreateDataStore(LocalNativeConnection conn) : base(conn) { }
+        internal LocalNativeCreateDataStore(LocalNativeConnection conn)
+            : base(conn)
+        {
+        }
+
 #endif
+
         protected override void ExecuteInternal()
         {
             MgFileFeatureSourceParams fp = new MgFileFeatureSourceParams(this.Provider, this.Name, this.CoordinateSystemWkt, MgFeatureCommandUtility.ConvertSchema(this.Schema));
@@ -523,4 +628,4 @@
             this.ConnImpl.CreateDataStore(new MgResourceIdentifier(this.FeatureSourceId), fp);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Commands/LocalGetResourceContents.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Commands/LocalGetResourceContents.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Commands/LocalGetResourceContents.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,33 +1,38 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Commands;
+using OSGeo.MapGuide.MaestroAPI.Resource;
 using System;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Commands;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using System.Diagnostics;
 using System.IO;
+using System.Text;
 
 #if LOCAL_API
+
 namespace OSGeo.MapGuide.MaestroAPI.Local.Commands
 #else
+
 namespace OSGeo.MapGuide.MaestroAPI.Native.Commands
 #endif
 {
@@ -36,25 +41,29 @@
         private MgResourceService _resSvc;
 
 #if LOCAL_API
+
         public LocalGetResourceContents(LocalConnection conn)
         {
             this.Parent = conn;
             var fact = new MgdServiceFactory();
             _resSvc = (MgResourceService)fact.CreateService(MgServiceType.ResourceService);
         }
-#else 
+
+#else
+
         public LocalGetResourceContents(LocalNativeConnection conn)
         {
             this.Parent = conn;
             _resSvc = (MgResourceService)conn.Connection.CreateService(MgServiceType.ResourceService);
         }
+
 #endif
 
         Dictionary<string, IResource> IGetResourceContents.Execute(IEnumerable<string> resourceIds)
         {
             //There is an implicit assumption here that all resource ids check out and that
             //there is no duplicates
-            
+
             var resources = new Dictionary<string, IResource>();
             if (this.Parent.SiteVersion >= new Version(2, 2))
             {
@@ -104,4 +113,4 @@
             private set;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeCapabilities.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeCapabilities.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeCapabilities.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,37 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Services;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Capability;
 using OSGeo.MapGuide.MaestroAPI.Commands;
+using System;
 
 namespace OSGeo.MapGuide.MaestroAPI.Native
 {
     public class LocalNativeCapabilities : ConnectionCapabilities
     {
-        internal LocalNativeCapabilities(IServerConnection parent) : base(parent) { }
+        internal LocalNativeCapabilities(IServerConnection parent)
+            : base(parent)
+        {
+        }
 
         public override int[] SupportedCommands
         {
@@ -37,7 +40,7 @@
                 if (_parent.SiteVersion >= new Version(2, 2))
                 {
                     //TODO: Work out what this can/can't do
-                    return new int[] 
+                    return new int[]
                     {
                         (int)CommandType.GetResourceContents,
                         (int)CommandType.ApplySchema,
@@ -49,7 +52,7 @@
                 else
                 {
                     //TODO: Work out what this can/can't do
-                    return new int[] 
+                    return new int[]
                     {
                         (int)CommandType.ApplySchema,
                         (int)CommandType.InsertFeature,
@@ -70,4 +73,4 @@
             get { return false; }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeConnection.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeConnection.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeConnection.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,50 +1,48 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.IO;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Commands;
 using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
+using OSGeo.MapGuide.MaestroAPI.Feature;
 using OSGeo.MapGuide.MaestroAPI.Mapping;
+using OSGeo.MapGuide.MaestroAPI.Native.Commands;
 using OSGeo.MapGuide.MaestroAPI.Resource;
-using OSGeo.MapGuide.MaestroAPI.Serialization;
+using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
 using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 using OSGeo.MapGuide.ObjectModels.Capabilities;
 using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using System.Diagnostics;
-using OSGeo.MapGuide.MaestroAPI.Commands;
-using OSGeo.MapGuide.MaestroAPI.Native.Commands;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.MaestroAPI.Feature;
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Drawing;
 using System.Globalization;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
+using System.IO;
+using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.Native
 {
-    public class LocalNativeConnection : MgServerConnectionBase, 
+    public class LocalNativeConnection : MgServerConnectionBase,
                                          IServerConnection,
                                          IFeatureService,
                                          IResourceService,
@@ -177,8 +175,8 @@
             if (type == null)
                 type = "";
             MgResourceService res = this.Connection.CreateService(MgServiceType.ResourceService) as MgResourceService;
-            GetByteReaderMethod fetch = () => 
-            { 
+            GetByteReaderMethod fetch = () =>
+            {
                 MgResourceIdentifier startingPoint = new MgResourceIdentifier(startingpoint);
                 return res.EnumerateResources(startingPoint, depth, type, computeChildren);
             };
@@ -191,7 +189,7 @@
             get
             {
                 MgFeatureService fes = this.Connection.CreateService(MgServiceType.FeatureService) as MgFeatureService;
-                GetByteReaderMethod fetch = () => 
+                GetByteReaderMethod fetch = () =>
                 {
                     return fes.GetFeatureProviders();
                 };
@@ -207,7 +205,7 @@
             System.Text.StringBuilder sb = new System.Text.StringBuilder();
             if (parameters != null)
             {
-                foreach(System.Collections.DictionaryEntry de in parameters)
+                foreach (System.Collections.DictionaryEntry de in parameters)
                     sb.Append((string)de.Key + "=" + (string)de.Value + "\t");
                 if (sb.Length > 0)
                     sb.Length--;
@@ -228,7 +226,7 @@
         public IFdoProviderCapabilities GetProviderCapabilities(string provider)
         {
             MgFeatureService fes = this.Connection.CreateService(MgServiceType.FeatureService) as MgFeatureService;
-            GetByteReaderMethod fetch = () => 
+            GetByteReaderMethod fetch = () =>
             {
                 return fes.GetCapabilities(provider);
             };
@@ -239,7 +237,7 @@
         public override System.IO.Stream GetResourceData(string resourceID, string dataname)
         {
             MgResourceService res = this.Connection.CreateService(MgServiceType.ResourceService) as MgResourceService;
-            GetByteReaderMethod fetch = () => 
+            GetByteReaderMethod fetch = () =>
             {
                 MgResourceIdentifier resId = new MgResourceIdentifier(resourceID);
                 return res.GetResourceData(resId, dataname);
@@ -251,7 +249,7 @@
         public override Stream GetResourceXmlData(string resourceID)
         {
             MgResourceService res = this.Connection.CreateService(MgServiceType.ResourceService) as MgResourceService;
-            GetByteReaderMethod fetch = () => 
+            GetByteReaderMethod fetch = () =>
             {
                 MgResourceIdentifier resId = new MgResourceIdentifier(resourceID);
                 return res.GetResourceContent(resId);
@@ -294,7 +292,7 @@
                 mgf.SetFilter(query);
 
             if (columns != null && columns.Length != 0)
-                foreach(string s in columns)
+                foreach (string s in columns)
                     mgf.AddFeatureProperty(s);
 
             if (computedProperties != null && computedProperties.Count > 0)
@@ -375,7 +373,7 @@
 
             return new FeatureSourceDescription(ms).Schemas[0];
         }
-        
+
         public void DeleteResourceData(string resourceID, string dataname)
         {
             MgResourceService res = this.Connection.CreateService(MgServiceType.ResourceService) as MgResourceService;
@@ -387,7 +385,7 @@
         public ResourceDataList EnumerateResourceData(string resourceID)
         {
             MgResourceService res = this.Connection.CreateService(MgServiceType.ResourceService) as MgResourceService;
-            GetByteReaderMethod fetch = () => 
+            GetByteReaderMethod fetch = () =>
             {
                 MgResourceIdentifier resId = new MgResourceIdentifier(resourceID);
                 return res.EnumerateResourceData(resId);
@@ -467,10 +465,9 @@
             return m_calc;
         }
 
+        private ICoordinateSystemCatalog m_coordsys = null;
+        //TODO: Figure out a strategy for cache invalidation
 
-        private ICoordinateSystemCatalog m_coordsys = null;
-        //TODO: Figure out a strategy for cache invalidation 
-        
         public ICoordinateSystemCatalog CoordinateSystemCatalog
         {
             get
@@ -497,7 +494,7 @@
         public override ResourceReferenceList EnumerateResourceReferences(string resourceid)
         {
             MgResourceService res = this.Connection.CreateService(MgServiceType.ResourceService) as MgResourceService;
-            GetByteReaderMethod fetch = () => 
+            GetByteReaderMethod fetch = () =>
             {
                 MgResourceIdentifier resId = new MgResourceIdentifier(resourceid);
                 return res.EnumerateReferences(resId);
@@ -532,7 +529,7 @@
 
             MgResourceService res = this.Connection.CreateService(MgServiceType.ResourceService) as MgResourceService;
             res.CopyResource(new MgResourceIdentifier(oldpath), new MgResourceIdentifier(newpath), overwrite);
-            
+
             LogMethodCall("MgResourceService::CopyResource", true, oldpath, newpath, overwrite.ToString());
 
             if (exists)
@@ -587,7 +584,7 @@
 
             string mapname = new ResourceIdentifier(resourceId).Path;
 
-            GetByteReaderMethod fetch = () => 
+            GetByteReaderMethod fetch = () =>
             {
                 MgMap map = new MgMap();
                 map.Open(res, mapname);
@@ -597,7 +594,7 @@
                 MgCoordinate coord = gf.CreateCoordinateXY(x, y);
                 return rnd.RenderMap(map, sel, coord, scale, width, height, color, format, true);
             };
-            LogMethodCall("MgRenderingService::RenderMap", true, "MgMap", "MgSelection", "MgPoint("+ x + "," + y + ")", scale.ToString(), width.ToString(), height.ToString(), "MgColor", format, true.ToString());
+            LogMethodCall("MgRenderingService::RenderMap", true, "MgMap", "MgSelection", "MgPoint(" + x + "," + y + ")", scale.ToString(), width.ToString(), height.ToString(), "MgColor", format, true.ToString());
             return new MgReadOnlyStream(fetch);
         }
 
@@ -612,7 +609,7 @@
 
             //TODO: The render is missing the clip param for the extent override method
 
-            GetByteReaderMethod fetch = () => 
+            GetByteReaderMethod fetch = () =>
             {
                 MgMap map = new MgMap();
                 map.Open(res, mapname);
@@ -653,7 +650,7 @@
             MgRenderingService rnd = this.Connection.CreateService(MgServiceType.RenderingService) as MgRenderingService;
             MgResourceService res = this.Connection.CreateService(MgServiceType.ResourceService) as MgResourceService;
 
-            GetByteReaderMethod fetch = () => 
+            GetByteReaderMethod fetch = () =>
             {
                 MgMap mmap = new MgMap();
                 mmap.Open(res, map.Name);
@@ -672,7 +669,7 @@
             MgRenderingService rnd = this.Connection.CreateService(MgServiceType.RenderingService) as MgRenderingService;
             MgResourceService res = this.Connection.CreateService(MgServiceType.ResourceService) as MgResourceService;
 
-            GetByteReaderMethod fetch = () => 
+            GetByteReaderMethod fetch = () =>
             {
                 MgMap mmap = new MgMap();
                 mmap.Open(res, map.Name);
@@ -686,7 +683,7 @@
 
         public override bool IsSessionExpiredException(Exception ex)
         {
-            return ex != null && ex.GetType() == typeof(OSGeo.MapGuide.MgSessionExpiredException) ||  ex.GetType() == typeof(OSGeo.MapGuide.MgSessionNotFoundException);
+            return ex != null && ex.GetType() == typeof(OSGeo.MapGuide.MgSessionExpiredException) || ex.GetType() == typeof(OSGeo.MapGuide.MgSessionNotFoundException);
         }
 
         /// <summary>
@@ -700,7 +697,7 @@
             MgFeatureService fes = this.Connection.CreateService(MgServiceType.FeatureService) as MgFeatureService;
             MgSpatialContextReader rd = fes.GetSpatialContexts(new MgResourceIdentifier(resourceID), activeOnly);
 
-            GetByteReaderMethod fetch = () => 
+            GetByteReaderMethod fetch = () =>
             {
                 return rd.ToXml();
             };
@@ -719,7 +716,7 @@
             MgFeatureService fes = this.Connection.CreateService(MgServiceType.FeatureService) as MgFeatureService;
             string[] parts = classname.Split(':');
             MgResourceIdentifier resId = new MgResourceIdentifier(resourceID);
-            
+
             if (parts.Length == 1)
                 parts = new string[] { classname };
             else if (parts.Length != 2)
@@ -759,7 +756,7 @@
                     mgui.SetLocale(m_locale);
                 else
                     mgui.SetLocale("en");
-                MgSiteConnection con = new MgSiteConnection(); 
+                MgSiteConnection con = new MgSiteConnection();
                 con.Open(mgui);
                 string s = con.GetSite().CreateSession();
                 if (s == null || s.Trim().Length == 0)
@@ -789,7 +786,7 @@
         public override UnmanagedDataList EnumerateUnmanagedData(string startpath, string filter, bool recursive, UnmanagedDataTypes type)
         {
             MgResourceService res = this.Connection.CreateService(MgServiceType.ResourceService) as MgResourceService;
-            GetByteReaderMethod fetch = () => 
+            GetByteReaderMethod fetch = () =>
             {
                 return res.EnumerateUnmanagedData(startpath, recursive, type.ToString(), filter);
             };
@@ -800,7 +797,7 @@
         public override void UpdateRepository(string resourceId, ResourceFolderHeaderType header)
         {
             MgResourceService res = this.Connection.CreateService(MgServiceType.ResourceService) as MgResourceService;
-            
+
             if (header == null)
             {
                 res.UpdateRepository(new MgResourceIdentifier(resourceId), null, null);
@@ -819,7 +816,7 @@
         public override object GetFolderOrResourceHeader(string resourceID)
         {
             MgResourceService res = this.Connection.CreateService(MgServiceType.ResourceService) as MgResourceService;
-            GetByteReaderMethod fetch = () => 
+            GetByteReaderMethod fetch = () =>
             {
                 MgResourceIdentifier resId = new MgResourceIdentifier(resourceID);
                 return res.GetResourceHeader(resId);
@@ -830,7 +827,6 @@
                 return this.DeserializeObject<ResourceDocumentHeaderType>(new MgReadOnlyStream(fetch));
         }
 
-
         /// <summary>
         /// Gets a list of users in a group
         /// </summary>
@@ -840,7 +836,7 @@
         {
             if (m_cachedUserList == null)
             {
-                GetByteReaderMethod fetch = () => 
+                GetByteReaderMethod fetch = () =>
                 {
                     MgSite site = this.Connection.GetSite();
                     return site.EnumerateUsers(group);
@@ -873,7 +869,7 @@
         public override System.IO.Stream GetTile(string mapdefinition, string baselayergroup, int col, int row, int scaleindex, string format)
         {
             MgTileService ts = this.Connection.CreateService(MgServiceType.TileService) as MgTileService;
-            GetByteReaderMethod fetch = () => 
+            GetByteReaderMethod fetch = () =>
             {
                 MgResourceIdentifier mdf = new MgResourceIdentifier(mapdefinition);
                 return ts.GetTile(mdf, baselayergroup, col, row, scaleindex);
@@ -942,7 +938,7 @@
         public override System.Drawing.Image GetLegendImage(double scale, string layerdefinition, int themeIndex, int type, int width, int height, string format)
         {
             MgMappingService ms = this.Connection.CreateService(MgServiceType.MappingService) as MgMappingService;
-            GetByteReaderMethod fetch = () => 
+            GetByteReaderMethod fetch = () =>
             {
                 MgResourceIdentifier ldef = new MgResourceIdentifier(layerdefinition);
                 return ms.GenerateLegendImage(ldef, scale, width, height, format, type, themeIndex);
@@ -968,14 +964,19 @@
             {
                 case CommandType.GetResourceContents:
                     return new LocalGetResourceContents(this);
+
                 case CommandType.CreateDataStore:
                     return new LocalNativeCreateDataStore(this);
+
                 case CommandType.ApplySchema:
                     return new LocalNativeApplySchema(this);
+
                 case CommandType.DeleteFeatures:
                     return new LocalNativeDelete(this);
+
                 case CommandType.InsertFeature:
                     return new LocalNativeInsert(this);
+
                 case CommandType.UpdateFeatures:
                     return new LocalNativeUpdate(this);
             }
@@ -986,7 +987,7 @@
 
         public IConnectionCapabilities Capabilities
         {
-            get 
+            get
             {
                 if (_caps == null)
                 {
@@ -1008,6 +1009,7 @@
                 case ServiceType.Tile:
                 case ServiceType.Site:
                     return this;
+
                 case ServiceType.Fusion:
                     if (this.SiteVersion >= new Version(2, 0))
                         return this;
@@ -1021,7 +1023,7 @@
             return this;
         }
 
-        const int MAX_INPUT_STREAM_SIZE_MB = 30;
+        private const int MAX_INPUT_STREAM_SIZE_MB = 30;
 
         public override void SetResourceData(string resourceid, string dataname, ResourceDataType datatype, Stream stream, OSGeo.MapGuide.MaestroAPI.Utility.StreamCopyProgressDelegate callback)
         {
@@ -1108,7 +1110,7 @@
         public override DataStoreList EnumerateDataStores(string providerName, string partialConnString)
         {
             var fes = (MgFeatureService)this.Connection.CreateService(MgServiceType.FeatureService);
-            GetByteReaderMethod fetch = () => 
+            GetByteReaderMethod fetch = () =>
             {
                 return fes.EnumerateDataStores(providerName, partialConnString);
             };
@@ -1248,7 +1250,7 @@
         public Stream DescribeDrawing(string resourceID)
         {
             var dwSvc = (MgDrawingService)this.Connection.CreateService(MgServiceType.DrawingService);
-            GetByteReaderMethod fetch = () => 
+            GetByteReaderMethod fetch = () =>
             {
                 MgResourceIdentifier resId = new MgResourceIdentifier(resourceID);
                 return dwSvc.DescribeDrawing(resId);
@@ -1273,7 +1275,7 @@
         public DrawingSectionResourceList EnumerateDrawingSectionResources(string resourceID, string sectionName)
         {
             var dwSvc = (MgDrawingService)this.Connection.CreateService(MgServiceType.DrawingService);
-            GetByteReaderMethod fetch = () => 
+            GetByteReaderMethod fetch = () =>
             {
                 MgResourceIdentifier resId = new MgResourceIdentifier(resourceID);
                 return dwSvc.EnumerateSectionResources(resId, sectionName);
@@ -1285,7 +1287,7 @@
         public DrawingSectionList EnumerateDrawingSections(string resourceID)
         {
             var dwSvc = (MgDrawingService)this.Connection.CreateService(MgServiceType.DrawingService);
-            GetByteReaderMethod fetch = () => 
+            GetByteReaderMethod fetch = () =>
             {
                 MgResourceIdentifier resId = new MgResourceIdentifier(resourceID);
                 return dwSvc.EnumerateSections(resId);
@@ -1317,7 +1319,7 @@
         public Stream GetLayer(string resourceID, string sectionName, string layerName)
         {
             var dwSvc = (MgDrawingService)this.Connection.CreateService(MgServiceType.DrawingService);
-            GetByteReaderMethod fetch = () => 
+            GetByteReaderMethod fetch = () =>
             {
                 MgResourceIdentifier resId = new MgResourceIdentifier(resourceID);
                 return dwSvc.GetLayer(resId, sectionName, layerName);
@@ -1541,7 +1543,7 @@
         }
     }
 
-    class LocalLongTransaction : ILongTransaction
+    internal class LocalLongTransaction : ILongTransaction
     {
         public LocalLongTransaction(MgLongTransactionReader rdr)
         {
@@ -1590,7 +1592,7 @@
         }
     }
 
-    class LocalLongTransactionList : ILongTransactionList
+    internal class LocalLongTransactionList : ILongTransactionList
     {
         private List<LocalLongTransaction> _transactions;
 
@@ -1609,4 +1611,4 @@
             get { return _transactions; }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeCoordinateSystem.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeCoordinateSystem.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeCoordinateSystem.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2009, Kenneth Skovhede
 // http://www.hexad.dk, opensource at hexad.dk
-// 
+//
 // 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
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
 
 namespace OSGeo.MapGuide.MaestroAPI.Native
@@ -29,7 +28,10 @@
     {
         private MgCoordinateSystemFactory _csFact;
 
-        public LocalNativeMpuCalculator() { _csFact = new MgCoordinateSystemFactory(); }
+        public LocalNativeMpuCalculator()
+        {
+            _csFact = new MgCoordinateSystemFactory();
+        }
 
         public double Calculate(string csWkt, double units)
         {
@@ -40,7 +42,10 @@
 
     public class LocalNativeCoordinateSystemDefinition : CoordinateSystemDefinitionBase
     {
-        internal LocalNativeCoordinateSystemDefinition() : base() { }
+        internal LocalNativeCoordinateSystemDefinition()
+            : base()
+        {
+        }
 
         internal LocalNativeCoordinateSystemDefinition(CoordinateSystemCategory parent, MgPropertyCollection props)
             : base(parent)
@@ -54,24 +59,31 @@
                     case "code":
                         m_code = (prop as MgStringProperty).Value;
                         break;
+
                     case "description":
                         m_description = (prop as MgStringProperty).Value;
                         break;
+
                     case "projection":
                         m_projection = (prop as MgStringProperty).Value;
                         break;
+
                     case "projection description":
                         m_projectionDescription = (prop as MgStringProperty).Value;
                         break;
+
                     case "Datum":
                         m_datum = (prop as MgStringProperty).Value;
                         break;
+
                     case "datum description":
                         m_datumDescription = (prop as MgStringProperty).Value;
                         break;
+
                     case "ellipsoid":
                         m_ellipsoid = (prop as MgStringProperty).Value;
                         break;
+
                     case "ellipsoid description":
                         m_ellipsoidDescription = (prop as MgStringProperty).Value;
                         break;
@@ -79,4 +91,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeCoordinateSystemCatalog.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeCoordinateSystemCatalog.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeCoordinateSystemCatalog.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
 using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
 
 namespace OSGeo.MapGuide.MaestroAPI.Native
 {
@@ -123,4 +124,4 @@
             return new LocalNativeSimpleTransform(sourceWkt, targetWkt);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeCoordinateSystemCategory.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeCoordinateSystemCategory.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeCoordinateSystemCategory.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,31 +1,34 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
 
 namespace OSGeo.MapGuide.MaestroAPI.Native
 {
     public class LocalNativeCoordinateSystemCategory : CoordinateSystemCategory
     {
-        public LocalNativeCoordinateSystemCategory(ICoordinateSystemCatalog parent, string name) : base(parent, name) { }
+        public LocalNativeCoordinateSystemCategory(ICoordinateSystemCatalog parent, string name)
+            : base(parent, name)
+        {
+        }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeDataReader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeDataReader.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeDataReader.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Feature;
+using OSGeo.MapGuide.MaestroAPI.Internal;
 using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.MaestroAPI.Internal;
+using System;
 
 namespace OSGeo.MapGuide.MaestroAPI.Native
 {
@@ -33,7 +34,7 @@
         private MgAgfReaderWriter _agfRw;
         private MgWktReaderWriter _wktRw;
 
-        public LocalNativeDataReader(MgDataReader reader) 
+        public LocalNativeDataReader(MgDataReader reader)
         {
             _reader = reader;
             _mgReader = new FixedWKTReader();

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeFeature.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeFeature.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeFeature.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,30 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.Feature;
+using OSGeo.MapGuide.MaestroAPI.Internal;
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using System.Collections.Generic;
 using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Feature;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.MaestroAPI.Internal;
 
 namespace OSGeo.MapGuide.MaestroAPI.Native
 {
@@ -45,25 +47,32 @@
                         case PropertyValueType.Blob:
                             ((BlobValue)_values[name]).Value = Utility.StreamAsArray(new MgReadOnlyStream(getblob));
                             break;
+
                         case PropertyValueType.Boolean:
                             ((BooleanValue)_values[name]).Value = reader.GetBoolean(name);
                             break;
+
                         case PropertyValueType.Byte:
                             ((ByteValue)_values[name]).Value = reader.GetByte(name);
                             break;
+
                         case PropertyValueType.Clob:
                             byte[] b = Utility.StreamAsArray(new MgReadOnlyStream(getclob));
                             ((ClobValue)_values[name]).Value = Encoding.UTF8.GetChars(b);
                             break;
+
                         case PropertyValueType.DateTime:
                             ((DateTimeValue)_values[name]).Value = Utility.ConvertMgDateTime(reader.GetDateTime(name));
                             break;
+
                         case PropertyValueType.Double:
                             ((DoubleValue)_values[name]).Value = reader.GetDouble(name);
                             break;
+
                         case PropertyValueType.Feature:
                             ((FeatureValue)_values[name]).Value = GetFeatureArray(reader, name);
                             break;
+
                         case PropertyValueType.Geometry:
                             //TODO: See if SWIG issues come into play here
                             try
@@ -78,18 +87,23 @@
                                 ((GeometryValue)_values[name]).SetNull();
                             }
                             break;
+
                         case PropertyValueType.Int16:
                             ((Int16Value)_values[name]).Value = reader.GetInt16(name);
                             break;
+
                         case PropertyValueType.Int32:
                             ((Int32Value)_values[name]).Value = reader.GetInt32(name);
                             break;
+
                         case PropertyValueType.Int64:
                             ((Int64Value)_values[name]).Value = reader.GetInt64(name);
                             break;
+
                         case PropertyValueType.Single:
                             ((SingleValue)_values[name]).Value = reader.GetSingle(name);
                             break;
+
                         case PropertyValueType.String:
                             ((StringValue)_values[name]).Value = reader.GetString(name);
                             break;
@@ -106,4 +120,4 @@
             return features.ToArray();
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeFeatureReader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeFeatureReader.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeFeatureReader.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,25 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide.MaestroAPI.Exceptions;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Feature;
 using OSGeo.MapGuide.MaestroAPI.Internal;
 using OSGeo.MapGuide.MaestroAPI.Schema;
@@ -34,7 +33,7 @@
         private MgAgfReaderWriter _agfRw;
         private MgWktReaderWriter _wktRw;
 
-        public LocalNativeFeatureReader(MgFeatureReader reader) 
+        public LocalNativeFeatureReader(MgFeatureReader reader)
         {
             _reader = reader;
             _mgReader = new FixedWKTReader();
@@ -109,4 +108,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeRecord.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeRecord.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeRecord.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Feature;
+using OSGeo.MapGuide.MaestroAPI.Internal;
 using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.MaestroAPI.Internal;
+using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI.Native
 {
@@ -42,42 +43,55 @@
                     case PropertyValueType.Blob:
                         _values[name] = new BlobValue();
                         break;
+
                     case PropertyValueType.Boolean:
                         _values[name] = new BooleanValue();
                         break;
+
                     case PropertyValueType.Byte:
                         _values[name] = new ByteValue();
                         break;
+
                     case PropertyValueType.Clob:
                         _values[name] = new ClobValue();
                         break;
+
                     case PropertyValueType.DateTime:
                         _values[name] = new DateTimeValue();
                         break;
+
                     case PropertyValueType.Double:
                         _values[name] = new DoubleValue();
                         break;
+
                     case PropertyValueType.Feature:
                         _values[name] = new FeatureValue();
                         break;
+
                     case PropertyValueType.Geometry:
                         _values[name] = new GeometryValue();
                         break;
+
                     case PropertyValueType.Int16:
                         _values[name] = new Int16Value();
                         break;
+
                     case PropertyValueType.Int32:
                         _values[name] = new Int32Value();
                         break;
+
                     case PropertyValueType.Int64:
                         _values[name] = new Int64Value();
                         break;
+
                     case PropertyValueType.Raster:
                         _values[name] = new RasterValue();
                         break;
+
                     case PropertyValueType.Single:
                         _values[name] = new SingleValue();
                         break;
+
                     case PropertyValueType.String:
                         _values[name] = new StringValue();
                         break;
@@ -98,19 +112,24 @@
                         case PropertyValueType.Blob:
                             ((BlobValue)_values[name]).Value = Utility.StreamAsArray(new MgReadOnlyStream(getblob));
                             break;
+
                         case PropertyValueType.Boolean:
                             ((BooleanValue)_values[name]).Value = reader.GetBoolean(name);
                             break;
+
                         case PropertyValueType.Byte:
                             ((ByteValue)_values[name]).Value = reader.GetByte(name);
                             break;
+
                         case PropertyValueType.Clob:
-                            byte [] b = Utility.StreamAsArray(new MgReadOnlyStream(getclob));
+                            byte[] b = Utility.StreamAsArray(new MgReadOnlyStream(getclob));
                             ((ClobValue)_values[name]).Value = Encoding.UTF8.GetChars(b);
                             break;
+
                         case PropertyValueType.DateTime:
                             ((DateTimeValue)_values[name]).Value = Utility.ConvertMgDateTime(reader.GetDateTime(name));
                             break;
+
                         case PropertyValueType.Double:
                             ((DoubleValue)_values[name]).Value = reader.GetDouble(name);
                             break;
@@ -128,18 +147,23 @@
                                 ((GeometryValue)_values[name]).SetNull();
                             }
                             break;
+
                         case PropertyValueType.Int16:
                             ((Int16Value)_values[name]).Value = reader.GetInt16(name);
                             break;
+
                         case PropertyValueType.Int32:
                             ((Int32Value)_values[name]).Value = reader.GetInt32(name);
                             break;
+
                         case PropertyValueType.Int64:
                             ((Int64Value)_values[name]).Value = reader.GetInt64(name);
                             break;
+
                         case PropertyValueType.Single:
                             ((SingleValue)_values[name]).Value = reader.GetSingle(name);
                             break;
+
                         case PropertyValueType.String:
                             ((StringValue)_values[name]).Value = reader.GetString(name);
                             break;
@@ -148,4 +172,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeSimpleTransform.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeSimpleTransform.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeSimpleTransform.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2011, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using OSGeo.MapGuide;
-using OSGeo.MapGuide.MaestroAPI.CoordinateSystem;
 
 namespace OSGeo.MapGuide.MaestroAPI.Native
 {
@@ -58,4 +58,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeSqlReader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeSqlReader.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeSqlReader.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.Feature;
+using OSGeo.MapGuide.MaestroAPI.Internal;
 using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.MaestroAPI.Internal;
+using System;
 
 namespace OSGeo.MapGuide.MaestroAPI.Native
 {
@@ -33,7 +34,7 @@
         private MgAgfReaderWriter _agfRw;
         private MgWktReaderWriter _wktRw;
 
-        public LocalNativeSqlReader(MgSqlDataReader reader) 
+        public LocalNativeSqlReader(MgSqlDataReader reader)
         {
             _reader = reader;
             _mgReader = new FixedWKTReader();
@@ -119,4 +120,4 @@
             return ClrFdoTypeMap.GetClrType(type);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/MgReadOnlyStream.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/MgReadOnlyStream.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/MgReadOnlyStream.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,27 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
+//
+
+#endregion Disclaimer / License
+
 using OSGeo.MapGuide.MaestroAPI.IO;
+using System;
 
 namespace OSGeo.MapGuide.MaestroAPI.Native
 {
@@ -64,14 +64,13 @@
 
         public override void Flush()
         {
-            
         }
 
         public override long Length
         {
             //NOTE: MgByteReader only returns remaining length! Should we
             //be keeping track of position and adding on this value?
-            get { return _reader.GetLength(); } 
+            get { return _reader.GetLength(); }
         }
 
         public override bool CanRewind
@@ -99,9 +98,9 @@
             {
                 byte[] b = new byte[count];
                 read = _reader.Read(b, count);
-                Array.Copy(b, 0, buffer, offset, read); 
+                Array.Copy(b, 0, buffer, offset, read);
             }
             return read;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,29 +1,31 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Native;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using OSGeo.MapGuide.MaestroAPI.Native;
-using OSGeo.MapGuide.MaestroAPI;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OSGeo.MapGuide.MaestroAPI.Native")]
@@ -32,12 +34,11 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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("D80991DF-E4D3-43ee-AF2B-C96AD8462C70")]
-
 [assembly: MaestroApiProvider("Maestro.LocalNative", "Maestro wrapper for official MapGuide API", typeof(LocalNativeConnection), true, true)]
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Utility.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Utility.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Utility.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,28 +1,29 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
+using GeoAPI.Geometries;
+using OSGeo.MapGuide.MaestroAPI.Schema;
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Drawing;
-using OSGeo.MapGuide.MaestroAPI.Schema;
-using GeoAPI.Geometries;
 
 namespace OSGeo.MapGuide.MaestroAPI.Native
 {
@@ -84,30 +85,43 @@
             {
                 case OSGeo.MapGuide.MgPropertyType.Byte:
                     return typeof(byte);
+
                 case OSGeo.MapGuide.MgPropertyType.Int16:
                     return typeof(short);
+
                 case OSGeo.MapGuide.MgPropertyType.Int32:
                     return typeof(int);
+
                 case OSGeo.MapGuide.MgPropertyType.Int64:
                     return typeof(long);
+
                 case OSGeo.MapGuide.MgPropertyType.Single:
                     return typeof(float);
+
                 case OSGeo.MapGuide.MgPropertyType.Double:
                     return typeof(double);
+
                 case OSGeo.MapGuide.MgPropertyType.Boolean:
                     return typeof(bool);
+
                 case OSGeo.MapGuide.MgPropertyType.Geometry:
                     return Utility.GeometryType;
+
                 case OSGeo.MapGuide.MgPropertyType.String:
                     return typeof(string);
+
                 case OSGeo.MapGuide.MgPropertyType.DateTime:
                     return typeof(DateTime);
+
                 case OSGeo.MapGuide.MgPropertyType.Raster:
                     return Utility.RasterType;
+
                 case OSGeo.MapGuide.MgPropertyType.Blob:
                     return typeof(byte[]);
+
                 case OSGeo.MapGuide.MgPropertyType.Clob:
                     return typeof(byte[]);
+
                 default:
                     throw new Exception("Failed to find type for: " + MgType.ToString());
             }
@@ -219,7 +233,6 @@
                 }
                 else if (prop.PropertyType == MgFeaturePropertyType.ObjectProperty)
                 {
-                    
                 }
                 else if (prop.PropertyType == MgFeaturePropertyType.AssociationProperty)
                 {
@@ -279,4 +292,4 @@
             return new DateTime(dt.Year, dt.Month, dt.Day, dt.Hour, dt.Minute, dt.Second, dt.Microsecond * 1000);
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Properties/GlobalAssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,25 +1,26 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Open Source Geospatial Foundation")]
@@ -28,12 +29,12 @@
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.0.0.0")]
+[assembly: AssemblyFileVersion("6.0.0.0")]
\ No newline at end of file

Modified: trunk/Tools/Maestro/Properties/SignedAssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Properties/SignedAssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Properties/SignedAssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 #pragma warning disable 1699
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("..\\..\\..\\Properties\\maestroapi.key")]

Modified: trunk/Tools/Maestro/Properties/SignedAssemblyInfo2.cs
===================================================================
--- trunk/Tools/Maestro/Properties/SignedAssemblyInfo2.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/Properties/SignedAssemblyInfo2.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,26 +1,27 @@
 #region Disclaimer / License
+
 // Copyright (C) 2010, 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
+//
+
+#endregion Disclaimer / License
+
 #pragma warning disable 1699
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("..\\Properties\\maestroapi.key")]

Modified: trunk/Tools/Maestro/ProviderTemplate/App.config
===================================================================
--- trunk/Tools/Maestro/ProviderTemplate/App.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/ProviderTemplate/App.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
-    <startup> 
+    <startup>
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
     </startup>
 </configuration>
\ No newline at end of file

Modified: trunk/Tools/Maestro/ProviderTemplate/Form1.cs
===================================================================
--- trunk/Tools/Maestro/ProviderTemplate/Form1.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/ProviderTemplate/Form1.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,13 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
 using System.Diagnostics;
-using System.Drawing;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace ProviderTemplate
@@ -34,7 +29,8 @@
         private void btnBuild_Click(object sender, EventArgs e)
         {
             btnBuild.Enabled = false;
-            worker.RunWorkerAsync(new BuildArgs() { 
+            worker.RunWorkerAsync(new BuildArgs()
+            {
                 FxDir = txtFxDir.Text,
                 MgDir = txtMgDir.Text,
                 MgVersion = txtMgVersion.Text,
@@ -52,7 +48,7 @@
             txtMessages.BeginInvoke(action);
         }
 
-        class BuildArgs
+        private class BuildArgs
         {
             public string FxDir;
             public string MgDir;
@@ -229,4 +225,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/ProviderTemplate/Program.cs
===================================================================
--- trunk/Tools/Maestro/ProviderTemplate/Program.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/ProviderTemplate/Program.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,22 +1,19 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace ProviderTemplate
 {
-    static class Program
+    internal static class Program
     {
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
         [STAThread]
-        static void Main()
+        private static void Main()
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
             Application.Run(new Form1());
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/ProviderTemplate/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/ProviderTemplate/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/ProviderTemplate/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("ProviderTemplate")]
@@ -14,8 +13,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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)]
 
@@ -25,12 +24,12 @@
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file

Modified: trunk/Tools/Maestro/RtMapInspector/MainForm.cs
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/MainForm.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/RtMapInspector/MainForm.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,34 +1,35 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
+using Maestro.Login;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Mapping;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using OSGeo.MapGuide.ObjectModels.Common;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Mapping;
-using OSGeo.MapGuide.MaestroAPI;
-using Maestro.Login;
-using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.ObjectModels.Common;
 
 namespace RtMapInspector
 {
@@ -45,7 +46,7 @@
 
         #region Design-time property wrappers
 
-        class PointDecorator
+        private class PointDecorator
         {
             private string _str;
 
@@ -60,7 +61,7 @@
             }
         }
 
-        class BoxDecorator
+        private class BoxDecorator
         {
             private string _str;
 
@@ -75,7 +76,7 @@
             }
         }
 
-        class MapDecorator
+        private class MapDecorator
         {
             private RuntimeMap _map;
 
@@ -168,7 +169,7 @@
             }
         }
 
-        class GroupDecorator
+        private class GroupDecorator
         {
             private RuntimeMapGroup _group;
 
@@ -240,7 +241,7 @@
             }
         }
 
-        class LayerDecorator
+        private class LayerDecorator
         {
             private RuntimeMapLayer _layer;
 
@@ -319,7 +320,7 @@
             public string LegendLabel
             {
                 get { return _layer.LegendLabel; }
-                set { _layer.LegendLabel = value; } 
+                set { _layer.LegendLabel = value; }
             }
 
             [Category("Layer Properties")]
@@ -397,7 +398,7 @@
             }
         }
 
-        class DrawOrderDisplayItem
+        private class DrawOrderDisplayItem
         {
             public string Label { get; private set; }
 
@@ -415,18 +416,18 @@
             }
         }
 
-        class ScaleRangeCollection : List<string>
+        private class ScaleRangeCollection : List<string>
         {
             public ScaleRangeCollection(RuntimeMapLayer.ScaleRange[] ranges)
             {
-                foreach(var s in ranges )
+                foreach (var s in ranges)
                 {
                     Add(s.MinScale + " : " + s.MaxScale);
                 }
             }
         }
 
-        class IdentityPropertyCollection : List<string>
+        private class IdentityPropertyCollection : List<string>
         {
             public IdentityPropertyCollection(PropertyInfo[] props)
             {
@@ -437,7 +438,7 @@
             }
         }
 
-        #endregion
+        #endregion Design-time property wrappers
 
         protected override void OnLoad(EventArgs e)
         {
@@ -484,11 +485,11 @@
             InitTabs();
         }
 
-        const int IDX_GROUP = 0;
-        const int IDX_GROUP_HIDDEN = 1;
-        const int IDX_LAYER = 2;
-        const int IDX_LAYER_HIDDEN = 3;
-        const int IDX_MAP = 4;
+        private const int IDX_GROUP = 0;
+        private const int IDX_GROUP_HIDDEN = 1;
+        private const int IDX_LAYER = 2;
+        private const int IDX_LAYER_HIDDEN = 3;
+        private const int IDX_MAP = 4;
 
         private TreeNode CreateGroupNode(RuntimeMapGroup group)
         {
@@ -576,7 +577,7 @@
             }
         }
 
-        static string Stringify(object[] values)
+        private static string Stringify(object[] values)
         {
             string[] list = new string[values.Length];
             for (int i = 0; i < values.Length; i++)
@@ -598,4 +599,4 @@
                 properties.SelectedObject = item.Decorator;
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/RtMapInspector/Program.cs
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/Program.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/RtMapInspector/Program.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,39 +1,41 @@
 #region Disclaimer / License
+
 // Copyright (C) 2012, 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
+//
+
+#endregion Disclaimer / License
+
 using System;
-using System.Collections.Generic;
 using System.Windows.Forms;
 
 namespace RtMapInspector
 {
-    static class Program
+    internal static class Program
     {
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
         [STAThread]
-        static void Main()
+        private static void Main()
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
             Application.Run(new MainForm());
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/RtMapInspector/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/RtMapInspector/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("RtMapInspector")]
@@ -11,10 +10,10 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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("cd28ed02-61bf-46cc-a986-4ff3b50b0aae")]
+[assembly: Guid("cd28ed02-61bf-46cc-a986-4ff3b50b0aae")]
\ No newline at end of file

Modified: trunk/Tools/Maestro/RtMapInspector/app.config
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/app.config	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/RtMapInspector/app.config	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <configuration>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>
-  </startup>
-  <!-- 
-  Uncomment the section below for proxy server support. 
-  
-  Note this doesn't work in Mono (see http://trac.osgeo.org/mapguide/ticket/2414)  
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client" />
+    </startup>
+    <!--
+  Uncomment the section below for proxy server support.
+
+  Note this doesn't work in Mono (see http://trac.osgeo.org/mapguide/ticket/2414)
   -->
-  <!--
+    <!--
   <system.net>
     <defaultProxy useDefaultCredentials="true" />
   </system.net>
   -->
-</configuration>
+</configuration>
\ No newline at end of file

Modified: trunk/Tools/Maestro/SignMapGuideApi/Program.cs
===================================================================
--- trunk/Tools/Maestro/SignMapGuideApi/Program.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/SignMapGuideApi/Program.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,30 +1,29 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
+using System.Diagnostics;
 using System.IO;
-using System.Diagnostics;
 
 namespace SignMapGuideApi
 {
-    class Program
+    internal class Program
     {
-        static string[] files = { "MapGuideDotNetApi", "OSGeo.MapGuide.Foundation", "OSGeo.MapGuide.Geometry", "OSGeo.MapGuide.MapGuideCommon", "OSGeo.MapGuide.PlatformBase", "OSGeo.MapGuide.Web" };
-        
-        static Dictionary<string, string[]> ilasm32Paths = new Dictionary<string, string[]>()
+        private static string[] files = { "MapGuideDotNetApi", "OSGeo.MapGuide.Foundation", "OSGeo.MapGuide.Geometry", "OSGeo.MapGuide.MapGuideCommon", "OSGeo.MapGuide.PlatformBase", "OSGeo.MapGuide.Web" };
+
+        private static Dictionary<string, string[]> ilasm32Paths = new Dictionary<string, string[]>()
         {
             { "2.0", new string [] { "C:\\Windows\\Microsoft.NET\\Framework\\v2.0.50727\\ilasm.exe" } },
             { "3.5", new string [] { "C:\\Windows\\Microsoft.NET\\Framework\\v2.0.50727\\ilasm.exe" } },
             { "4.0", new string [] { "C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\ilasm.exe" } },
         };
 
-        static Dictionary<string, string[]> ilasm64Paths = new Dictionary<string, string[]>()
+        private static Dictionary<string, string[]> ilasm64Paths = new Dictionary<string, string[]>()
         {
             { "2.0", new string [] { "C:\\Windows\\Microsoft.NET\\Framework64\\v2.0.50727\\ilasm.exe" } },
             { "3.5", new string [] { "C:\\Windows\\Microsoft.NET\\Framework64\\v2.0.50727\\ilasm.exe" } },
             { "4.0", new string [] { "C:\\Windows\\Microsoft.NET\\Framework64\\v4.0.30319\\ilasm.exe" } },
         };
 
-        static Dictionary<string, string[]> ildasm32Paths = new Dictionary<string, string[]>()
+        private static Dictionary<string, string[]> ildasm32Paths = new Dictionary<string, string[]>()
         {
             { "2.0", new string [] { "C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A\\Bin\\ildasm.exe",
                                  "C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v6.0A\\Bin\\ildasm.exe",
@@ -44,7 +43,7 @@
                                  "C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v7.1\\bin\\NETFX 4.0 Tools\\ildasm.exe" }}
         };
 
-        static Dictionary<string, string[]> ildasm64Paths = new Dictionary<string, string[]>()
+        private static Dictionary<string, string[]> ildasm64Paths = new Dictionary<string, string[]>()
         {
             { "2.0", new string [] { "C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A\\Bin\\x64\\ildasm.exe",
                                  "C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v6.0A\\Bin\\x64\\ildasm.exe",
@@ -65,15 +64,16 @@
         };
 
         //TODO: Allow for custom key and infer public key token from it
-        static string _keyFile = "maestroapi.key";
-        static string _publicKeyToken = "F5 26 C4 89 29 FD A8 56";
+        private static string _keyFile = "maestroapi.key";
 
-        static bool Is64BitProcess()
+        private static string _publicKeyToken = "F5 26 C4 89 29 FD A8 56";
+
+        private static bool Is64BitProcess()
         {
             return IntPtr.Size == 8;
         }
 
-        static string getILDASMEXE(string frameworkVersion)
+        private static string getILDASMEXE(string frameworkVersion)
         {
             if (Is64BitProcess())
             {
@@ -96,7 +96,7 @@
             return null;
         }
 
-        static string getILASMEXE(string frameworkVersion)
+        private static string getILASMEXE(string frameworkVersion)
         {
             if (Is64BitProcess())
             {
@@ -119,7 +119,7 @@
             return null;
         }
 
-        static void backup()
+        private static void backup()
         {
             Console.Write("Creating Backup folder...");
             Directory.CreateDirectory("Backup");
@@ -139,7 +139,7 @@
             }
         }
 
-        static void decompile(string decompiler)
+        private static void decompile(string decompiler)
         {
             foreach (string f in files)
             {
@@ -157,7 +157,7 @@
             }
         }
 
-        static void cleandll()
+        private static void cleandll()
         {
             foreach (string f in files)
             {
@@ -168,7 +168,7 @@
             }
         }
 
-        static void compile(string compiler, string file)
+        private static void compile(string compiler, string file)
         {
             if (!File.Exists(file + ".il"))
             {
@@ -183,7 +183,7 @@
             Console.WriteLine("Done");
         }
 
-        static bool assemblyLine(string line)
+        private static bool assemblyLine(string line)
         {
             string l = line.ToLower();
             if (l.StartsWith(".assembly extern"))
@@ -203,7 +203,7 @@
             return false;
         }
 
-        static void fixKey(string file)
+        private static void fixKey(string file)
         {
             string ilfile = file + ".il";
             if (!File.Exists(ilfile))
@@ -234,7 +234,7 @@
             fin.Close();
         }
 
-        static void cleanup()
+        private static void cleanup()
         {
             Console.Write("Cleanup...");
             foreach (string f in files)
@@ -251,7 +251,7 @@
             Console.WriteLine("Done");
         }
 
-        static void Main(string[] args)
+        private static void Main(string[] args)
         {
             string fxVersion = "2.0"; //default version
             foreach (var arg in args)
@@ -295,4 +295,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

Modified: trunk/Tools/Maestro/SignMapGuideApi/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/SignMapGuideApi/Properties/AssemblyInfo.cs	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/SignMapGuideApi/Properties/AssemblyInfo.cs	2014-12-25 08:20:40 UTC (rev 8459)
@@ -1,8 +1,7 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("SignMapGuideApi")]
@@ -14,8 +13,8 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// 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 
+// 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)]
 
@@ -25,12 +24,12 @@
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file

Modified: trunk/Tools/Maestro/TestData/gen_default1_MySql_master.xml
===================================================================
--- trunk/Tools/Maestro/TestData/gen_default1_MySql_master.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/TestData/gen_default1_MySql_master.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -2,45 +2,45 @@
 <fdo:DataStore xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:fds="http://fdo.osgeo.org/schemas/fds">
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://fdo.osgeo.org/schemas/feature/AutoGen" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:gml="http://www.opengis.net/gml" xmlns:AutoGen="http://fdo.osgeo.org/schemas/feature/AutoGen" elementFormDefault="qualified" attributeFormDefault="unqualified">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:element name="rtable1" type="AutoGen:rtable1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="rtable1Key">
-<xs:selector xpath=".//rtable1"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//rtable1" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="rtable1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
@@ -49,60 +49,60 @@
 </xs:complexType>
 <xs:element name="rtable2" type="AutoGen:rtable2Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="rtable2Key">
-<xs:selector xpath=".//rtable2"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//rtable2" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="rtable2Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE1_ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="TABLE3_KEY1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE3_KEY2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -112,44 +112,44 @@
 </xs:complexType>
 <xs:element name="rtable5" type="AutoGen:rtable5Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="rtable5Key">
-<xs:selector xpath=".//rtable5"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//rtable5" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="rtable5Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="2"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="2" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE5_ID">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
@@ -158,53 +158,53 @@
 </xs:complexType>
 <xs:element name="rtable6" type="AutoGen:rtable6Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="rtable6Key">
-<xs:selector xpath=".//rtable6"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//rtable6" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="rtable6Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="2"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="2" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE6_ID1">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="TABLE6_ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -214,45 +214,45 @@
 </xs:complexType>
 <xs:element name="rtable7" type="AutoGen:rtable7Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="rtable7Key">
-<xs:selector xpath=".//rtable7"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//rtable7" />
+<xs:field xpath="ID" />
 </xs:key>
 <xs:unique name="rtable7Key_0">
-<xs:selector xpath=".//rtable7"/>
-<xs:field xpath="TABLE7_ID12345678901234567890"/>
+<xs:selector xpath=".//rtable7" />
+<xs:field xpath="TABLE7_ID12345678901234567890" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="rtable7Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE7_ID12345678901234567890" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
@@ -261,390 +261,390 @@
 </xs:complexType>
 <xs:element name="table1" type="AutoGen:table1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table1Key">
-<xs:selector xpath=".//table1"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//table1" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:key>
 <xs:unique name="table1Key_0">
-<xs:selector xpath=".//table1"/>
-<xs:field xpath="AUTOINCREMENT_COLUMN"/>
+<xs:selector xpath=".//table1" />
+<xs:field xpath="AUTOINCREMENT_COLUMN" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="table1Type" abstract="false" fdo:hasGeometry="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="gml:AbstractFeatureType">
 <xs:sequence>
 <xs:element name="AUTOINCREMENT_COLUMN" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BINARY_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BIT15_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="fdo:int16" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BIT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BIT1_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:boolean"/>
+<xs:restriction base="xs:boolean" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BIT2_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="fdo:byte" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BIT31_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BIT32_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BIT8_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="fdo:byte" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BIT9_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="fdo:int16" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BLOB_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BOOL_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="fdo:int16" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="fdo:byte" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="CHAR1_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="1"/>
+<xs:maxLength value="1" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="CHAR5_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="5"/>
+<xs:maxLength value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="DATE2_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:dateTime"/>
+<xs:restriction base="xs:dateTime" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="DECIMAL_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="5"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="DOUBLE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="ENUM_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="255"/>
+<xs:maxLength value="255" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="GEOMETRYCOLLECTION_COLUMN" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="Default" fdo:geometricTypes="point curve surface " fdo:geometryTypes="multigeometry ">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INSERT_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="25"/>
+<xs:maxLength value="25" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="INT16_COLUMN345678901234567890" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="fdo:int16" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT32_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT64_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="LINESTRING_COLUMN" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="Default" fdo:geometricTypes="curve " fdo:geometryTypes="linestring ">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="MEDIUMBLOB_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="MEDIUMINT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="MULTILINESTRING_COLUMN" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="Default" fdo:geometricTypes="curve " fdo:geometryTypes="multilinestring ">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="MULTIPOINT_COLUMN" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="Default" fdo:geometricTypes="point " fdo:geometryTypes="multipoint ">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="MULTIPOLYGON_COLUMN" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="Default" fdo:geometricTypes="surface " fdo:geometryTypes="multipolygon ">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="NEW_GEOM_COLUMN" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="Default" fdo:geometricTypes="point curve surface " fdo:geometryTypes="point multipoint linestring multilinestring polygon multipolygon ">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="OBJECT_NAME" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="64"/>
+<xs:maxLength value="64" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="POINT_COLUMN" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="Default" fdo:geometricTypes="point " fdo:geometryTypes="point ">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="POLGON_COLUMN" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="Default" fdo:geometricTypes="surface " fdo:geometryTypes="polygon ">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="SET_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="255"/>
+<xs:maxLength value="255" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="SINGLE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:float"/>
+<xs:restriction base="xs:float" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TEXT_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="65535"/>
+<xs:maxLength value="65535" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TIMESTAMP_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:dateTime"/>
+<xs:restriction base="xs:dateTime" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="TIME_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:dateTime"/>
+<xs:restriction base="xs:dateTime" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="TINYBLOB_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="TINYINT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="fdo:int16" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="UINT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="USMALLINT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="VARBINARY_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="YEAR_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
@@ -653,43 +653,43 @@
 </xs:complexType>
 <xs:element name="table3" type="AutoGen:table3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table3Key">
-<xs:selector xpath=".//table3"/>
-<xs:field xpath="KEY1"/>
-<xs:field xpath="KEY2"/>
+<xs:selector xpath=".//table3" />
+<xs:field xpath="KEY1" />
+<xs:field xpath="KEY2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="table3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="DOUBLE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="KEY1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="KEY2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -699,45 +699,45 @@
 </xs:complexType>
 <xs:element name="table4" type="AutoGen:table4Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table4Key">
-<xs:selector xpath=".//table4"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//table4" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="table4Type" abstract="false" fdo:geometryName="GEOM_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="gml:AbstractFeatureType">
 <xs:sequence>
 <xs:element name="GEOM_COLUMN" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="Default" fdo:geometricTypes="point curve surface " fdo:geometryTypes="point multipoint linestring multilinestring polygon multipolygon ">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="fdo:int16" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -747,35 +747,35 @@
 </xs:complexType>
 <xs:element name="table5" type="AutoGen:table5Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table5Key">
-<xs:selector xpath=".//table5"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//table5" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="table5Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="2"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="2" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -785,46 +785,46 @@
 </xs:complexType>
 <xs:element name="table6" type="AutoGen:table6Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table6Key">
-<xs:selector xpath=".//table6"/>
-<xs:field xpath="ID1"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//table6" />
+<xs:field xpath="ID1" />
+<xs:field xpath="ID2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="table6Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="2"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="2" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -834,32 +834,32 @@
 </xs:complexType>
 <xs:element name="table7" type="AutoGen:table7Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table7Key">
-<xs:selector xpath=".//table7"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//table7" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="table7Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -869,37 +869,37 @@
 </xs:complexType>
 <xs:complexType name="view1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:sequence>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="fdo:byte" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="DEC_COL_RENAME" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="5"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 </xs:schema>
-</fdo:DataStore>
+</fdo:DataStore>
\ No newline at end of file

Modified: trunk/Tools/Maestro/TestData/gen_default1_Oracle_master.xml
===================================================================
--- trunk/Tools/Maestro/TestData/gen_default1_Oracle_master.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/TestData/gen_default1_Oracle_master.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -19,42 +19,42 @@
 2000000.000000 2000000.000000</gml:pos>
 </gml:boundingBox>
 </gml:validArea>
-<gml:baseCRS xlink:href="http://fdo.osgeo.org/crs#default_cartesian"/>
-<gml:definedByConversion xlink:href="http://fdo.osgeo.org/coord_conversions#identity"/>
+<gml:baseCRS xlink:href="http://fdo.osgeo.org/crs#default_cartesian" />
+<gml:definedByConversion xlink:href="http://fdo.osgeo.org/coord_conversions#identity" />
 <gml:derivedCRSType codeSpace="http://fdo.osgeo.org/crs_types">
 geographic</gml:derivedCRSType>
-<gml:usesCS xlink:href="http://fdo.osgeo.org/cs#default_cartesian"/>
+<gml:usesCS xlink:href="http://fdo.osgeo.org/cs#default_cartesian" />
 </gml:DerivedCRS>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://fdo.osgeo.org/schemas/feature/AutoGen" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:gml="http://www.opengis.net/gml" xmlns:AutoGen="http://fdo.osgeo.org/schemas/feature/AutoGen" elementFormDefault="qualified" attributeFormDefault="unqualified">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType name="RAWTABLE1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:complexType>
 <xs:element name="RAWTABLE2" type="AutoGen:RAWTABLE2Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="RAWTABLE2Key">
-<xs:selector xpath=".//RAWTABLE2"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//RAWTABLE2" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="RAWTABLE2Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -64,70 +64,70 @@
 </xs:complexType>
 <xs:element name="RTABLE1" type="AutoGen:RTABLE1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="RTABLE1Key">
-<xs:selector xpath=".//RTABLE1"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//RTABLE1" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="RTABLE1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="FK_RTABLE1_TABLE1" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="AutoGen_RTABLE1_FK_RTABLE1_TABLE1" refer="AutoGen:TABLE1_RTABLE1AKey">
-<xs:selector xpath=".//RTABLE1"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//RTABLE1" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:keyref>
 </xs:element>
 <xs:element name="ID">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -137,124 +137,124 @@
 </xs:complexType>
 <xs:element name="RTABLE2" type="AutoGen:RTABLE2Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="RTABLE2Key">
-<xs:selector xpath=".//RTABLE2"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//RTABLE2" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="RTABLE2Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="FK_RTABLE2_TABLE1" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="TABLE1_ID">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="AutoGen_RTABLE2_FK_RTABLE2_TABLE1" refer="AutoGen:TABLE1_RTABLE2AKey">
-<xs:selector xpath=".//RTABLE2"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//RTABLE2" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:keyref>
 </xs:element>
 <xs:element name="FK_RTABLE2_TABLE3" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="TABLE3_KEY1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE3_KEY2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="AutoGen_RTABLE2_FK_RTABLE2_TABLE3" refer="AutoGen:TABLE3_RTABLE2AKey">
-<xs:selector xpath=".//RTABLE2"/>
-<xs:field xpath="KEY1"/>
-<xs:field xpath="KEY2"/>
+<xs:selector xpath=".//RTABLE2" />
+<xs:field xpath="KEY1" />
+<xs:field xpath="KEY2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="ID">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE1_ID">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE3_KEY1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE3_KEY2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -264,44 +264,44 @@
 </xs:complexType>
 <xs:element name="RTABLE5" type="AutoGen:RTABLE5Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="RTABLE5Key">
-<xs:selector xpath=".//RTABLE5"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//RTABLE5" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="RTABLE5Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="2"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="2" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE5_ID">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
@@ -310,53 +310,53 @@
 </xs:complexType>
 <xs:element name="RTABLE6" type="AutoGen:RTABLE6Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="RTABLE6Key">
-<xs:selector xpath=".//RTABLE6"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//RTABLE6" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="RTABLE6Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="2"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="2" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE6_ID1">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="TABLE6_ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -366,74 +366,74 @@
 </xs:complexType>
 <xs:element name="RTABLE7" type="AutoGen:RTABLE7Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="RTABLE7Key">
-<xs:selector xpath=".//RTABLE7"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//RTABLE7" />
+<xs:field xpath="ID" />
 </xs:key>
 <xs:unique name="RTABLE7Key_0">
-<xs:selector xpath=".//RTABLE7"/>
-<xs:field xpath="TABLE7_ID12345678901234567890"/>
+<xs:selector xpath=".//RTABLE7" />
+<xs:field xpath="TABLE7_ID12345678901234567890" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="RTABLE7Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="FK_RTABLE7_TABLE7" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="TABLE7_ID12345678901234567890">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="20"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="20" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="AutoGen_RTABLE7_FK_RTABLE7_TABLE7" refer="AutoGen:TABLE7_RTABLE7AKey">
-<xs:selector xpath=".//RTABLE7"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//RTABLE7" />
+<xs:field xpath="ID" />
 </xs:keyref>
 </xs:element>
 <xs:element name="ID">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="20"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="20" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE7_ID12345678901234567890">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="20"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="20" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -443,268 +443,268 @@
 </xs:complexType>
 <xs:element name="TABLE1" type="AutoGen:TABLE1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="TABLE1Key">
-<xs:selector xpath=".//TABLE1"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//TABLE1" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:key>
 <xs:key name="TABLE1_RTABLE1AKey">
-<xs:selector xpath=".//AutoGen"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//AutoGen" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:key>
 <xs:key name="TABLE1_RTABLE2AKey">
-<xs:selector xpath=".//AutoGen"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//AutoGen" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:key>
 </xs:element>
 <xs:complexType name="TABLE1Type" abstract="false" fdo:hasGeometry="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="gml:AbstractFeatureType">
 <xs:sequence>
 <xs:element name="BINARY_DOUBLE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BINARY_FLOAT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:float"/>
+<xs:restriction base="xs:float" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BLOB_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BOOL_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="1"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="1" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="3"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="3" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="DECIMAL_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="5"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="DOUBLE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="FLOAT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="GEOM_COLUMN_2D_MEASURE" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="sc_1" fdo:geometricTypes="point curve surface " fdo:geometryTypes="point multipoint linestring multilinestring curvestring multicurvestring polygon multipolygon curvepolygon multicurvepolygon ">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="GEOM_COLUMN_3D" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="true" fdo:srsName="Default" fdo:geometricTypes="point curve surface " fdo:geometryTypes="point multipoint linestring multilinestring curvestring multicurvestring polygon multipolygon curvepolygon multicurvepolygon ">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="GEOM_COLUMN_3D_MEASURE" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="true" fdo:srsName="Default" fdo:geometricTypes="point curve surface " fdo:geometryTypes="point multipoint linestring multilinestring curvestring multicurvestring polygon multipolygon curvepolygon multicurvepolygon ">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="INSERT_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="25"/>
+<xs:maxLength value="25" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="INT16_COLUMN345678901234567890" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="5"/>
-<xs:fractionDigits value=""/>
-<xs:maxExclusive value="20000"/>
+<xs:totalDigits value="5" />
+<xs:fractionDigits value="" />
+<xs:maxExclusive value="20000" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="INT32_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="INT64_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="20"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="20" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="INTERVAL_DAY_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="INTERVAL_YEAR_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="LONG_STRING" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="4000"/>
+<xs:maxLength value="4000" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NCHAR_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="1"/>
+<xs:maxLength value="1" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NEW_GEOM_COLUMN" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="sc_1" fdo:geometricTypes="point curve surface " fdo:geometryTypes="point multipoint linestring multilinestring curvestring multicurvestring polygon multipolygon curvepolygon multicurvepolygon ">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="NVARCHAR_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="5"/>
+<xs:maxLength value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="OBJECT_NAME" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="30"/>
+<xs:maxLength value="30" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="SINGLE_CHAR_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="1"/>
+<xs:maxLength value="1" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="SINGLE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TIMESTAMP_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -714,48 +714,48 @@
 </xs:complexType>
 <xs:element name="TABLE3" type="AutoGen:TABLE3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="TABLE3Key">
-<xs:selector xpath=".//TABLE3"/>
-<xs:field xpath="KEY1"/>
-<xs:field xpath="KEY2"/>
+<xs:selector xpath=".//TABLE3" />
+<xs:field xpath="KEY1" />
+<xs:field xpath="KEY2" />
 </xs:key>
 <xs:key name="TABLE3_RTABLE2AKey">
-<xs:selector xpath=".//AutoGen"/>
-<xs:field xpath="KEY1"/>
-<xs:field xpath="KEY2"/>
+<xs:selector xpath=".//AutoGen" />
+<xs:field xpath="KEY1" />
+<xs:field xpath="KEY2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="TABLE3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="DOUBLE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="KEY1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="KEY2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -765,51 +765,51 @@
 </xs:complexType>
 <xs:element name="TABLE4" type="AutoGen:TABLE4Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="TABLE4Key">
-<xs:selector xpath=".//TABLE4"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//TABLE4" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="TABLE4Type" abstract="false" fdo:geometryName="GEOM_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="gml:AbstractFeatureType">
 <xs:sequence>
 <xs:element name="GEOM_COLUMN" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="true" fdo:srsName="Default" fdo:geometricTypes="point curve surface " fdo:geometryTypes="point multipoint linestring multilinestring curvestring multicurvestring polygon multipolygon curvepolygon multicurvepolygon ">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="ID">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="5"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="5" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -819,35 +819,35 @@
 </xs:complexType>
 <xs:element name="TABLE5" type="AutoGen:TABLE5Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="TABLE5Key">
-<xs:selector xpath=".//TABLE5"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//TABLE5" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="TABLE5Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="2"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="2" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -857,46 +857,46 @@
 </xs:complexType>
 <xs:element name="TABLE6" type="AutoGen:TABLE6Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="TABLE6Key">
-<xs:selector xpath=".//TABLE6"/>
-<xs:field xpath="ID1"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//TABLE6" />
+<xs:field xpath="ID1" />
+<xs:field xpath="ID2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="TABLE6Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="2"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="2" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -906,39 +906,39 @@
 </xs:complexType>
 <xs:element name="TABLE7" type="AutoGen:TABLE7Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="TABLE7Key">
-<xs:selector xpath=".//TABLE7"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//TABLE7" />
+<xs:field xpath="ID" />
 </xs:key>
 <xs:key name="TABLE7_RTABLE7AKey">
-<xs:selector xpath=".//AutoGen"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//AutoGen" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="TABLE7Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="20"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="20" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -948,134 +948,134 @@
 </xs:complexType>
 <xs:element name="VERTABLE1" type="AutoGen:VERTABLE1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERTABLE1Key">
-<xs:selector xpath=".//VERTABLE1"/>
-<xs:field xpath="ID1"/>
+<xs:selector xpath=".//VERTABLE1" />
+<xs:field xpath="ID1" />
 </xs:key>
 <xs:unique name="VERTABLE1Key_0">
-<xs:selector xpath=".//VERTABLE1"/>
-<xs:field xpath="NAME"/>
+<xs:selector xpath=".//VERTABLE1" />
+<xs:field xpath="NAME" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="VERTABLE1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
-<xs:maxExclusive value="1"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
+<xs:maxExclusive value="1" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="IDB1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="IDB2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="VERTABLE1_VERTABLELOOKUP1" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="AutoGen_VERTABLE1_VERTABLE1_VERTABLELOOKUP1" refer="AutoGen:VERTABLELOOKUP1_VERTABLE1AKey">
-<xs:selector xpath=".//VERTABLE1"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//VERTABLE1" />
+<xs:field xpath="ID2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="VERTABLE1_VERTABLELOOKUPB1" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="IDB1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="IDB2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="AutoGen_VERTABLE1_VERTABLE1_VERTABLELOOKUPB1" refer="AutoGen:VERTABLELOOKUPB1_VERTABLE1AKey">
-<xs:selector xpath=".//VERTABLE1"/>
-<xs:field xpath="ID1"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//VERTABLE1" />
+<xs:field xpath="ID1" />
+<xs:field xpath="ID2" />
 </xs:keyref>
 </xs:element>
 </xs:sequence>
@@ -1084,134 +1084,134 @@
 </xs:complexType>
 <xs:element name="VERTABLE2" type="AutoGen:VERTABLE2Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERTABLE2Key">
-<xs:selector xpath=".//VERTABLE2"/>
-<xs:field xpath="ID1"/>
+<xs:selector xpath=".//VERTABLE2" />
+<xs:field xpath="ID1" />
 </xs:key>
 <xs:unique name="VERTABLE2Key_0">
-<xs:selector xpath=".//VERTABLE2"/>
-<xs:field xpath="NAME"/>
+<xs:selector xpath=".//VERTABLE2" />
+<xs:field xpath="NAME" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="VERTABLE2Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
-<xs:maxExclusive value="2"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
+<xs:maxExclusive value="2" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="IDB1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="IDB2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="VERTABLE2_VERTABLELOOKUP2" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="AutoGen_VERTABLE2_VERTABLE2_VERTABLELOOKUP2" refer="AutoGen:VERTABLELOOKUP2_VERTABLE2AKey">
-<xs:selector xpath=".//VERTABLE2"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//VERTABLE2" />
+<xs:field xpath="ID2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="VERTABLE2_VERTABLELOOKUPB2" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="IDB1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="IDB2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="AutoGen_VERTABLE2_VERTABLE2_VERTABLELOOKUPB2" refer="AutoGen:VERTABLELOOKUPB2_VERTABLE2AKey">
-<xs:selector xpath=".//VERTABLE2"/>
-<xs:field xpath="ID1"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//VERTABLE2" />
+<xs:field xpath="ID1" />
+<xs:field xpath="ID2" />
 </xs:keyref>
 </xs:element>
 </xs:sequence>
@@ -1220,134 +1220,134 @@
 </xs:complexType>
 <xs:element name="VERTABLE3" type="AutoGen:VERTABLE3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERTABLE3Key">
-<xs:selector xpath=".//VERTABLE3"/>
-<xs:field xpath="ID1"/>
+<xs:selector xpath=".//VERTABLE3" />
+<xs:field xpath="ID1" />
 </xs:key>
 <xs:unique name="VERTABLE3Key_0">
-<xs:selector xpath=".//VERTABLE3"/>
-<xs:field xpath="NAME"/>
+<xs:selector xpath=".//VERTABLE3" />
+<xs:field xpath="NAME" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="VERTABLE3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
-<xs:maxExclusive value="3"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
+<xs:maxExclusive value="3" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="IDB1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="IDB2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="VERTABLE3_VERTABLELOOKUP3" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="AutoGen_VERTABLE3_VERTABLE3_VERTABLELOOKUP3" refer="AutoGen:VERTABLELOOKUP3_VERTABLE3AKey">
-<xs:selector xpath=".//VERTABLE3"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//VERTABLE3" />
+<xs:field xpath="ID2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="VERTABLE3_VERTABLELOOKUPB3" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="IDB1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="IDB2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="AutoGen_VERTABLE3_VERTABLE3_VERTABLELOOKUPB3" refer="AutoGen:VERTABLELOOKUPB3_VERTABLE3AKey">
-<xs:selector xpath=".//VERTABLE3"/>
-<xs:field xpath="ID1"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//VERTABLE3" />
+<xs:field xpath="ID1" />
+<xs:field xpath="ID2" />
 </xs:keyref>
 </xs:element>
 </xs:sequence>
@@ -1356,140 +1356,140 @@
 </xs:complexType>
 <xs:element name="VERTABLE4" type="AutoGen:VERTABLE4Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERTABLE4Key">
-<xs:selector xpath=".//VERTABLE4"/>
-<xs:field xpath="ID1"/>
+<xs:selector xpath=".//VERTABLE4" />
+<xs:field xpath="ID1" />
 </xs:key>
 <xs:unique name="VERTABLE4Key_0">
-<xs:selector xpath=".//VERTABLE4"/>
-<xs:field xpath="ID2"/>
-<xs:field xpath="IDB1"/>
-<xs:field xpath="IDB2"/>
+<xs:selector xpath=".//VERTABLE4" />
+<xs:field xpath="ID2" />
+<xs:field xpath="IDB1" />
+<xs:field xpath="IDB2" />
 </xs:unique>
 <xs:unique name="VERTABLE4Key_1">
-<xs:selector xpath=".//VERTABLE4"/>
-<xs:field xpath="NAME"/>
+<xs:selector xpath=".//VERTABLE4" />
+<xs:field xpath="NAME" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="VERTABLE4Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
-<xs:maxExclusive value="4"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
+<xs:maxExclusive value="4" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="IDB1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="IDB2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="VERTABLE4_VERTABLELOOKUP4" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="AutoGen_VERTABLE4_VERTABLE4_VERTABLELOOKUP4" refer="AutoGen:VERTABLELOOKUP4_VERTABLE4AKey">
-<xs:selector xpath=".//VERTABLE4"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//VERTABLE4" />
+<xs:field xpath="ID2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="VERTABLE4_VERTABLELOOKUPB4" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="IDB1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="IDB2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="AutoGen_VERTABLE4_VERTABLE4_VERTABLELOOKUPB4" refer="AutoGen:VERTABLELOOKUPB4_VERTABLE4AKey">
-<xs:selector xpath=".//VERTABLE4"/>
-<xs:field xpath="ID1"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//VERTABLE4" />
+<xs:field xpath="ID1" />
+<xs:field xpath="ID2" />
 </xs:keyref>
 </xs:element>
 </xs:sequence>
@@ -1498,140 +1498,140 @@
 </xs:complexType>
 <xs:element name="VERTABLE5" type="AutoGen:VERTABLE5Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERTABLE5Key">
-<xs:selector xpath=".//VERTABLE5"/>
-<xs:field xpath="ID1"/>
+<xs:selector xpath=".//VERTABLE5" />
+<xs:field xpath="ID1" />
 </xs:key>
 <xs:unique name="VERTABLE5Key_0">
-<xs:selector xpath=".//VERTABLE5"/>
-<xs:field xpath="ID2"/>
-<xs:field xpath="IDB1"/>
-<xs:field xpath="IDB2"/>
+<xs:selector xpath=".//VERTABLE5" />
+<xs:field xpath="ID2" />
+<xs:field xpath="IDB1" />
+<xs:field xpath="IDB2" />
 </xs:unique>
 <xs:unique name="VERTABLE5Key_1">
-<xs:selector xpath=".//VERTABLE5"/>
-<xs:field xpath="NAME"/>
+<xs:selector xpath=".//VERTABLE5" />
+<xs:field xpath="NAME" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="VERTABLE5Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
-<xs:maxExclusive value="5"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
+<xs:maxExclusive value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="IDB1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="IDB2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="VERTABLE5_VERTABLELOOKUP5" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="AutoGen_VERTABLE5_VERTABLE5_VERTABLELOOKUP5" refer="AutoGen:VERTABLELOOKUP5_VERTABLE5AKey">
-<xs:selector xpath=".//VERTABLE5"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//VERTABLE5" />
+<xs:field xpath="ID2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="VERTABLE5_VERTABLELOOKUPB5" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="IDB1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="IDB2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="AutoGen_VERTABLE5_VERTABLE5_VERTABLELOOKUPB5" refer="AutoGen:VERTABLELOOKUPB5_VERTABLE5AKey">
-<xs:selector xpath=".//VERTABLE5"/>
-<xs:field xpath="ID1"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//VERTABLE5" />
+<xs:field xpath="ID1" />
+<xs:field xpath="ID2" />
 </xs:keyref>
 </xs:element>
 </xs:sequence>
@@ -1640,43 +1640,43 @@
 </xs:complexType>
 <xs:element name="VERTABLELOOKUP1" type="AutoGen:VERTABLELOOKUP1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERTABLELOOKUP1Key">
-<xs:selector xpath=".//VERTABLELOOKUP1"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//VERTABLELOOKUP1" />
+<xs:field xpath="ID2" />
 </xs:key>
 <xs:key name="VERTABLELOOKUP1_VERTABLE1AKey">
-<xs:selector xpath=".//AutoGen"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//AutoGen" />
+<xs:field xpath="ID2" />
 </xs:key>
 <xs:unique name="VERTABLELOOKUP1Key_0">
-<xs:selector xpath=".//VERTABLELOOKUP1"/>
-<xs:field xpath="NAME"/>
+<xs:selector xpath=".//VERTABLELOOKUP1" />
+<xs:field xpath="NAME" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="VERTABLELOOKUP1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1686,43 +1686,43 @@
 </xs:complexType>
 <xs:element name="VERTABLELOOKUP2" type="AutoGen:VERTABLELOOKUP2Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERTABLELOOKUP2Key">
-<xs:selector xpath=".//VERTABLELOOKUP2"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//VERTABLELOOKUP2" />
+<xs:field xpath="ID2" />
 </xs:key>
 <xs:key name="VERTABLELOOKUP2_VERTABLE2AKey">
-<xs:selector xpath=".//AutoGen"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//AutoGen" />
+<xs:field xpath="ID2" />
 </xs:key>
 <xs:unique name="VERTABLELOOKUP2Key_0">
-<xs:selector xpath=".//VERTABLELOOKUP2"/>
-<xs:field xpath="NAME"/>
+<xs:selector xpath=".//VERTABLELOOKUP2" />
+<xs:field xpath="NAME" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="VERTABLELOOKUP2Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1732,43 +1732,43 @@
 </xs:complexType>
 <xs:element name="VERTABLELOOKUP3" type="AutoGen:VERTABLELOOKUP3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERTABLELOOKUP3Key">
-<xs:selector xpath=".//VERTABLELOOKUP3"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//VERTABLELOOKUP3" />
+<xs:field xpath="ID2" />
 </xs:key>
 <xs:key name="VERTABLELOOKUP3_VERTABLE3AKey">
-<xs:selector xpath=".//AutoGen"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//AutoGen" />
+<xs:field xpath="ID2" />
 </xs:key>
 <xs:unique name="VERTABLELOOKUP3Key_0">
-<xs:selector xpath=".//VERTABLELOOKUP3"/>
-<xs:field xpath="NAME"/>
+<xs:selector xpath=".//VERTABLELOOKUP3" />
+<xs:field xpath="NAME" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="VERTABLELOOKUP3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1778,43 +1778,43 @@
 </xs:complexType>
 <xs:element name="VERTABLELOOKUP4" type="AutoGen:VERTABLELOOKUP4Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERTABLELOOKUP4Key">
-<xs:selector xpath=".//VERTABLELOOKUP4"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//VERTABLELOOKUP4" />
+<xs:field xpath="ID2" />
 </xs:key>
 <xs:key name="VERTABLELOOKUP4_VERTABLE4AKey">
-<xs:selector xpath=".//AutoGen"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//AutoGen" />
+<xs:field xpath="ID2" />
 </xs:key>
 <xs:unique name="VERTABLELOOKUP4Key_0">
-<xs:selector xpath=".//VERTABLELOOKUP4"/>
-<xs:field xpath="NAME"/>
+<xs:selector xpath=".//VERTABLELOOKUP4" />
+<xs:field xpath="NAME" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="VERTABLELOOKUP4Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1824,43 +1824,43 @@
 </xs:complexType>
 <xs:element name="VERTABLELOOKUP5" type="AutoGen:VERTABLELOOKUP5Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERTABLELOOKUP5Key">
-<xs:selector xpath=".//VERTABLELOOKUP5"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//VERTABLELOOKUP5" />
+<xs:field xpath="ID2" />
 </xs:key>
 <xs:key name="VERTABLELOOKUP5_VERTABLE5AKey">
-<xs:selector xpath=".//AutoGen"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//AutoGen" />
+<xs:field xpath="ID2" />
 </xs:key>
 <xs:unique name="VERTABLELOOKUP5Key_0">
-<xs:selector xpath=".//VERTABLELOOKUP5"/>
-<xs:field xpath="NAME"/>
+<xs:selector xpath=".//VERTABLELOOKUP5" />
+<xs:field xpath="NAME" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="VERTABLELOOKUP5Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1870,52 +1870,52 @@
 </xs:complexType>
 <xs:element name="VERTABLELOOKUPB1" type="AutoGen:VERTABLELOOKUPB1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERTABLELOOKUPB1Key">
-<xs:selector xpath=".//VERTABLELOOKUPB1"/>
-<xs:field xpath="ID1"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//VERTABLELOOKUPB1" />
+<xs:field xpath="ID1" />
+<xs:field xpath="ID2" />
 </xs:key>
 <xs:key name="VERTABLELOOKUPB1_VERTABLE1AKey">
-<xs:selector xpath=".//AutoGen"/>
-<xs:field xpath="ID1"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//AutoGen" />
+<xs:field xpath="ID1" />
+<xs:field xpath="ID2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="VERTABLELOOKUPB1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1925,52 +1925,52 @@
 </xs:complexType>
 <xs:element name="VERTABLELOOKUPB2" type="AutoGen:VERTABLELOOKUPB2Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERTABLELOOKUPB2Key">
-<xs:selector xpath=".//VERTABLELOOKUPB2"/>
-<xs:field xpath="ID1"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//VERTABLELOOKUPB2" />
+<xs:field xpath="ID1" />
+<xs:field xpath="ID2" />
 </xs:key>
 <xs:key name="VERTABLELOOKUPB2_VERTABLE2AKey">
-<xs:selector xpath=".//AutoGen"/>
-<xs:field xpath="ID1"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//AutoGen" />
+<xs:field xpath="ID1" />
+<xs:field xpath="ID2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="VERTABLELOOKUPB2Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1980,52 +1980,52 @@
 </xs:complexType>
 <xs:element name="VERTABLELOOKUPB3" type="AutoGen:VERTABLELOOKUPB3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERTABLELOOKUPB3Key">
-<xs:selector xpath=".//VERTABLELOOKUPB3"/>
-<xs:field xpath="ID1"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//VERTABLELOOKUPB3" />
+<xs:field xpath="ID1" />
+<xs:field xpath="ID2" />
 </xs:key>
 <xs:key name="VERTABLELOOKUPB3_VERTABLE3AKey">
-<xs:selector xpath=".//AutoGen"/>
-<xs:field xpath="ID1"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//AutoGen" />
+<xs:field xpath="ID1" />
+<xs:field xpath="ID2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="VERTABLELOOKUPB3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -2035,52 +2035,52 @@
 </xs:complexType>
 <xs:element name="VERTABLELOOKUPB4" type="AutoGen:VERTABLELOOKUPB4Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERTABLELOOKUPB4Key">
-<xs:selector xpath=".//VERTABLELOOKUPB4"/>
-<xs:field xpath="ID1"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//VERTABLELOOKUPB4" />
+<xs:field xpath="ID1" />
+<xs:field xpath="ID2" />
 </xs:key>
 <xs:key name="VERTABLELOOKUPB4_VERTABLE4AKey">
-<xs:selector xpath=".//AutoGen"/>
-<xs:field xpath="ID1"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//AutoGen" />
+<xs:field xpath="ID1" />
+<xs:field xpath="ID2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="VERTABLELOOKUPB4Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -2090,52 +2090,52 @@
 </xs:complexType>
 <xs:element name="VERTABLELOOKUPB5" type="AutoGen:VERTABLELOOKUPB5Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERTABLELOOKUPB5Key">
-<xs:selector xpath=".//VERTABLELOOKUPB5"/>
-<xs:field xpath="ID1"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//VERTABLELOOKUPB5" />
+<xs:field xpath="ID1" />
+<xs:field xpath="ID2" />
 </xs:key>
 <xs:key name="VERTABLELOOKUPB5_VERTABLE5AKey">
-<xs:selector xpath=".//AutoGen"/>
-<xs:field xpath="ID1"/>
-<xs:field xpath="ID2"/>
+<xs:selector xpath=".//AutoGen" />
+<xs:field xpath="ID1" />
+<xs:field xpath="ID2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="VERTABLELOOKUPB5Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="ID2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -2145,35 +2145,35 @@
 </xs:complexType>
 <xs:element name="VERVIEW1" type="AutoGen:VERVIEW1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERVIEW1Key">
-<xs:selector xpath=".//VERVIEW1"/>
-<xs:field xpath="ID1"/>
+<xs:selector xpath=".//VERVIEW1" />
+<xs:field xpath="ID1" />
 </xs:key>
 </xs:element>
 <xs:complexType name="VERVIEW1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -2183,35 +2183,35 @@
 </xs:complexType>
 <xs:element name="VERVIEW2" type="AutoGen:VERVIEW2Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERVIEW2Key">
-<xs:selector xpath=".//VERVIEW2"/>
-<xs:field xpath="ID1"/>
+<xs:selector xpath=".//VERVIEW2" />
+<xs:field xpath="ID1" />
 </xs:key>
 </xs:element>
 <xs:complexType name="VERVIEW2Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -2221,35 +2221,35 @@
 </xs:complexType>
 <xs:element name="VERVIEW3" type="AutoGen:VERVIEW3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERVIEW3Key">
-<xs:selector xpath=".//VERVIEW3"/>
-<xs:field xpath="ID1"/>
+<xs:selector xpath=".//VERVIEW3" />
+<xs:field xpath="ID1" />
 </xs:key>
 </xs:element>
 <xs:complexType name="VERVIEW3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -2259,35 +2259,35 @@
 </xs:complexType>
 <xs:element name="VERVIEW4" type="AutoGen:VERVIEW4Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERVIEW4Key">
-<xs:selector xpath=".//VERVIEW4"/>
-<xs:field xpath="ID1"/>
+<xs:selector xpath=".//VERVIEW4" />
+<xs:field xpath="ID1" />
 </xs:key>
 </xs:element>
 <xs:complexType name="VERVIEW4Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -2297,35 +2297,35 @@
 </xs:complexType>
 <xs:element name="VERVIEW5" type="AutoGen:VERVIEW5Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERVIEW5Key">
-<xs:selector xpath=".//VERVIEW5"/>
-<xs:field xpath="ID1"/>
+<xs:selector xpath=".//VERVIEW5" />
+<xs:field xpath="ID1" />
 </xs:key>
 </xs:element>
 <xs:complexType name="VERVIEW5Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -2335,24 +2335,24 @@
 </xs:complexType>
 <xs:element name="VERVIEWB1" type="AutoGen:VERVIEWB1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERVIEWB1Key">
-<xs:selector xpath=".//VERVIEWB1"/>
-<xs:field xpath="NAME"/>
+<xs:selector xpath=".//VERVIEWB1" />
+<xs:field xpath="NAME" />
 </xs:key>
 </xs:element>
 <xs:complexType name="VERVIEWB1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -2362,16 +2362,16 @@
 </xs:complexType>
 <xs:complexType name="VERVIEWB2Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:sequence>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -2379,24 +2379,24 @@
 </xs:complexType>
 <xs:element name="VERVIEWB3" type="AutoGen:VERVIEWB3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERVIEWB3Key">
-<xs:selector xpath=".//VERVIEWB3"/>
-<xs:field xpath="NAME"/>
+<xs:selector xpath=".//VERVIEWB3" />
+<xs:field xpath="NAME" />
 </xs:key>
 </xs:element>
 <xs:complexType name="VERVIEWB3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -2406,16 +2406,16 @@
 </xs:complexType>
 <xs:complexType name="VERVIEWB4Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:sequence>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -2423,24 +2423,24 @@
 </xs:complexType>
 <xs:element name="VERVIEWB5" type="AutoGen:VERVIEWB5Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VERVIEWB5Key">
-<xs:selector xpath=".//VERVIEWB5"/>
-<xs:field xpath="NAME"/>
+<xs:selector xpath=".//VERVIEWB5" />
+<xs:field xpath="NAME" />
 </xs:key>
 </xs:element>
 <xs:complexType name="VERVIEWB5Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="NAME">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -2450,47 +2450,47 @@
 </xs:complexType>
 <xs:element name="VIEW1" type="AutoGen:VIEW1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VIEW1Key">
-<xs:selector xpath=".//VIEW1"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//VIEW1" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:key>
 </xs:element>
 <xs:complexType name="VIEW1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="3"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="3" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="DEC_COL_RENAME" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="5"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -2500,51 +2500,51 @@
 </xs:complexType>
 <xs:element name="VIEW3" type="AutoGen:VIEW3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="VIEW3Key">
-<xs:selector xpath=".//VIEW3"/>
-<xs:field xpath="STRING_COLUMN"/>
+<xs:selector xpath=".//VIEW3" />
+<xs:field xpath="STRING_COLUMN" />
 </xs:key>
 </xs:element>
 <xs:complexType name="VIEW3Type" abstract="false" fdo:geometryName="GEOM_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="gml:AbstractFeatureType">
 <xs:sequence>
 <xs:element name="GEOM_COLUMN" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="true" fdo:srsName="Default" fdo:geometricTypes="point curve surface " fdo:geometryTypes="point multipoint linestring multilinestring curvestring multicurvestring polygon multipolygon curvepolygon multicurvepolygon ">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="ID">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="5"/>
-<xs:fractionDigits value=""/>
+<xs:totalDigits value="5" />
+<xs:fractionDigits value="" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -2553,4 +2553,4 @@
 </xs:complexContent>
 </xs:complexType>
 </xs:schema>
-</fdo:DataStore>
+</fdo:DataStore>
\ No newline at end of file

Modified: trunk/Tools/Maestro/TestData/gen_default1_SQLServerSpatial_master.xml
===================================================================
--- trunk/Tools/Maestro/TestData/gen_default1_SQLServerSpatial_master.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/TestData/gen_default1_SQLServerSpatial_master.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -2,66 +2,66 @@
 <fdo:DataStore xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:fds="http://fdo.osgeo.org/schemas/fds">
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://fdo.osgeo.org/schemas/feature/dbo" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:gml="http://www.opengis.net/gml" xmlns:dbo="http://fdo.osgeo.org/schemas/feature/dbo" elementFormDefault="qualified" attributeFormDefault="unqualified">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:element name="rtable1" type="dbo:rtable1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="rtable1Key">
-<xs:selector xpath=".//rtable1"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//rtable1" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="rtable1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="FK_RTABLE1_TABLE1" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="dbo_rtable1_FK_RTABLE1_TABLE1" refer="dbo:table1_rtable1AKey">
-<xs:selector xpath=".//rtable1"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//rtable1" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:keyref>
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
@@ -70,115 +70,115 @@
 </xs:complexType>
 <xs:element name="rtable2" type="dbo:rtable2Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="rtable2Key">
-<xs:selector xpath=".//rtable2"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//rtable2" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="rtable2Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="FK_RTABLE2_TABLE1" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="TABLE1_ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="dbo_rtable2_FK_RTABLE2_TABLE1" refer="dbo:table1_rtable2AKey">
-<xs:selector xpath=".//rtable2"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//rtable2" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:keyref>
 </xs:element>
 <xs:element name="FK_RTABLE2_TABLE3" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="TABLE3_KEY1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE3_KEY2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="dbo_rtable2_FK_RTABLE2_TABLE3" refer="dbo:table3_rtable2AKey">
-<xs:selector xpath=".//rtable2"/>
-<xs:field xpath="KEY1"/>
-<xs:field xpath="KEY2"/>
+<xs:selector xpath=".//rtable2" />
+<xs:field xpath="KEY1" />
+<xs:field xpath="KEY2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE1_ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="TABLE3_KEY1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE3_KEY2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -188,45 +188,45 @@
 </xs:complexType>
 <xs:element name="rtable7" type="dbo:rtable7Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="rtable7Key">
-<xs:selector xpath=".//rtable7"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//rtable7" />
+<xs:field xpath="ID" />
 </xs:key>
 <xs:unique name="rtable7Key_0">
-<xs:selector xpath=".//rtable7"/>
-<xs:field xpath="TABLE7_ID12345678901234567890"/>
+<xs:selector xpath=".//rtable7" />
+<xs:field xpath="TABLE7_ID12345678901234567890" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="rtable7Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE7_ID12345678901234567890" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
@@ -235,331 +235,331 @@
 </xs:complexType>
 <xs:element name="table1" type="dbo:table1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table1Key">
-<xs:selector xpath=".//table1"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//table1" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:key>
 <xs:key name="table1_rtable1AKey">
-<xs:selector xpath=".//dbo"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//dbo" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:key>
 <xs:key name="table1_rtable2AKey">
-<xs:selector xpath=".//dbo"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//dbo" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:key>
 </xs:element>
 <xs:complexType name="table1Type" abstract="false" fdo:geometryName="NEW_GEOM_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="gml:AbstractFeatureType">
 <xs:sequence>
 <xs:element name="BINARY_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BLOB_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BOOL_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:boolean"/>
+<xs:restriction base="xs:boolean" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="fdo:byte" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="CHAR1_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="1"/>
+<xs:maxLength value="1" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="CHAR5_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="5"/>
+<xs:maxLength value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="DECIMAL_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="5"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="DOUBLE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INSERT_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="25"/>
+<xs:maxLength value="25" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="INT16_COLUMN345678901234567890" minOccurs="0">
 <xs:simpleType>
 <xs:restriction base="fdo:int16">
-<xs:maxExclusive value="20000"/>
+<xs:maxExclusive value="20000" />
 </xs:restriction>
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT32_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT64_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="LONG_STRING" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="8000"/>
+<xs:maxLength value="8000" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="MONEY_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="19"/>
-<xs:fractionDigits value="4"/>
+<xs:totalDigits value="19" />
+<xs:fractionDigits value="4" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NCHAR_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NEW_GEOM_COLUMN" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="Default" fdo:geometricTypes="point curve surface " fdo:geometryTypes="point multipoint linestring multilinestring curvestring multicurvestring polygon multipolygon curvepolygon multicurvepolygon ">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="NTEXT_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="1073741823"/>
+<xs:maxLength value="1073741823" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NUMERIC_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="5"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NVARCHAR_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NVARCHAR_MAX_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="1073741823"/>
+<xs:maxLength value="1073741823" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="OBJECT_NAME" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="128"/>
+<xs:maxLength value="128" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="REAL_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:float"/>
+<xs:restriction base="xs:float" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="SINGLE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:float"/>
+<xs:restriction base="xs:float" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="SMALLDATETIME_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:dateTime"/>
+<xs:restriction base="xs:dateTime" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="SMALLMONEY_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="4"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="4" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TEXT_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="2147483647"/>
+<xs:maxLength value="2147483647" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TIMESTAMP_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:dateTime"/>
+<xs:restriction base="xs:dateTime" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="TINYINT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="fdo:byte" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="UNIQUEID_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="36"/>
+<xs:maxLength value="36" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="VARBINARY_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="VARCHAR_MAX_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="2147483647"/>
+<xs:maxLength value="2147483647" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -569,48 +569,48 @@
 </xs:complexType>
 <xs:element name="table3" type="dbo:table3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table3Key">
-<xs:selector xpath=".//table3"/>
-<xs:field xpath="KEY1"/>
-<xs:field xpath="KEY2"/>
+<xs:selector xpath=".//table3" />
+<xs:field xpath="KEY1" />
+<xs:field xpath="KEY2" />
 </xs:key>
 <xs:key name="table3_rtable2AKey">
-<xs:selector xpath=".//dbo"/>
-<xs:field xpath="KEY1"/>
-<xs:field xpath="KEY2"/>
+<xs:selector xpath=".//dbo" />
+<xs:field xpath="KEY1" />
+<xs:field xpath="KEY2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="table3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="DOUBLE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="KEY1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="KEY2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -620,45 +620,45 @@
 </xs:complexType>
 <xs:element name="table4" type="dbo:table4Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table4Key">
-<xs:selector xpath=".//table4"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//table4" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="table4Type" abstract="false" fdo:geometryName="GEOM_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="gml:AbstractFeatureType">
 <xs:sequence>
 <xs:element name="GEOM_COLUMN" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="Default" fdo:geometricTypes="point curve surface " fdo:geometryTypes="point multipoint linestring multilinestring curvestring multicurvestring polygon multipolygon curvepolygon multicurvepolygon ">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="fdo:int16" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -668,32 +668,32 @@
 </xs:complexType>
 <xs:element name="table7" type="dbo:table7Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table7Key">
-<xs:selector xpath=".//table7"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//table7" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="table7Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -703,42 +703,42 @@
 </xs:complexType>
 <xs:element name="view1" type="dbo:view1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="view1Key">
-<xs:selector xpath=".//view1"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//view1" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:key>
 </xs:element>
 <xs:complexType name="view1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="fdo:byte" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="DEC_COL_RENAME" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="5"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
@@ -747,45 +747,45 @@
 </xs:complexType>
 <xs:element name="view3" type="dbo:view3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="view3Key">
-<xs:selector xpath=".//view3"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//view3" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="view3Type" abstract="false" fdo:geometryName="GEOM_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="gml:AbstractFeatureType">
 <xs:sequence>
 <xs:element name="GEOM_COLUMN" type="gml:AbstractGeometryType" fdo:hasMeasure="false" fdo:hasElevation="false" fdo:srsName="Default" fdo:geometricTypes="point curve surface " fdo:geometryTypes="point multipoint linestring multilinestring curvestring multicurvestring polygon multipolygon curvepolygon multicurvepolygon ">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="fdo:int16" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -796,117 +796,117 @@
 </xs:schema>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://fdo.osgeo.org/schemas/feature/guest" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:gml="http://www.opengis.net/gml" xmlns:guest="http://fdo.osgeo.org/schemas/feature/guest" elementFormDefault="qualified" attributeFormDefault="unqualified">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:element name="vertable1" type="guest:vertable1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertable1Key">
-<xs:selector xpath=".//vertable1"/>
-<xs:field xpath="id1"/>
+<xs:selector xpath=".//vertable1" />
+<xs:field xpath="id1" />
 </xs:key>
 <xs:unique name="vertable1Key_0">
-<xs:selector xpath=".//vertable1"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertable1" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertable1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="guest_vertable_vertablelookup1" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable1_guest_vertable_vertablelookup1" refer="guest:vertablelookup1_vertable1AKey">
-<xs:selector xpath=".//vertable1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable1" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="guest_vertable_vertablelookupb1" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable1_guest_vertable_vertablelookupb1" refer="guest:vertablelookupb1_vertable1AKey">
-<xs:selector xpath=".//vertable1"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable1" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
 <xs:restriction base="fdo:int32">
-<xs:maxExclusive value="1"/>
+<xs:maxExclusive value="1" />
 </xs:restriction>
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -916,113 +916,113 @@
 </xs:complexType>
 <xs:element name="vertable2" type="guest:vertable2Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertable2Key">
-<xs:selector xpath=".//vertable2"/>
-<xs:field xpath="id1"/>
+<xs:selector xpath=".//vertable2" />
+<xs:field xpath="id1" />
 </xs:key>
 <xs:unique name="vertable2Key_0">
-<xs:selector xpath=".//vertable2"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertable2" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertable2Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="guest_vertable_vertablelookup2" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable2_guest_vertable_vertablelookup2" refer="guest:vertablelookup2_vertable2AKey">
-<xs:selector xpath=".//vertable2"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable2" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="guest_vertable_vertablelookupb2" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable2_guest_vertable_vertablelookupb2" refer="guest:vertablelookupb2_vertable2AKey">
-<xs:selector xpath=".//vertable2"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable2" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
 <xs:restriction base="fdo:int32">
-<xs:maxExclusive value="2"/>
+<xs:maxExclusive value="2" />
 </xs:restriction>
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1032,113 +1032,113 @@
 </xs:complexType>
 <xs:element name="vertable3" type="guest:vertable3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertable3Key">
-<xs:selector xpath=".//vertable3"/>
-<xs:field xpath="id1"/>
+<xs:selector xpath=".//vertable3" />
+<xs:field xpath="id1" />
 </xs:key>
 <xs:unique name="vertable3Key_0">
-<xs:selector xpath=".//vertable3"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertable3" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertable3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="guest_vertable_vertablelookup3" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable3_guest_vertable_vertablelookup3" refer="guest:vertablelookup3_vertable3AKey">
-<xs:selector xpath=".//vertable3"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable3" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="guest_vertable_vertablelookupb3" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable3_guest_vertable_vertablelookupb3" refer="guest:vertablelookupb3_vertable3AKey">
-<xs:selector xpath=".//vertable3"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable3" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
 <xs:restriction base="fdo:int32">
-<xs:maxExclusive value="3"/>
+<xs:maxExclusive value="3" />
 </xs:restriction>
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1148,119 +1148,119 @@
 </xs:complexType>
 <xs:element name="vertable4" type="guest:vertable4Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertable4Key">
-<xs:selector xpath=".//vertable4"/>
-<xs:field xpath="id1"/>
+<xs:selector xpath=".//vertable4" />
+<xs:field xpath="id1" />
 </xs:key>
 <xs:unique name="vertable4Key_0">
-<xs:selector xpath=".//vertable4"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertable4" />
+<xs:field xpath="name" />
 </xs:unique>
 <xs:unique name="vertable4Key_1">
-<xs:selector xpath=".//vertable4"/>
-<xs:field xpath="id2"/>
-<xs:field xpath="idb1"/>
-<xs:field xpath="idb2"/>
+<xs:selector xpath=".//vertable4" />
+<xs:field xpath="id2" />
+<xs:field xpath="idb1" />
+<xs:field xpath="idb2" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertable4Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="guest_vertable_vertablelookup4" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable4_guest_vertable_vertablelookup4" refer="guest:vertablelookup4_vertable4AKey">
-<xs:selector xpath=".//vertable4"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable4" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="guest_vertable_vertablelookupb4" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable4_guest_vertable_vertablelookupb4" refer="guest:vertablelookupb4_vertable4AKey">
-<xs:selector xpath=".//vertable4"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable4" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
 <xs:restriction base="fdo:int32">
-<xs:maxExclusive value="4"/>
+<xs:maxExclusive value="4" />
 </xs:restriction>
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1270,119 +1270,119 @@
 </xs:complexType>
 <xs:element name="vertable5" type="guest:vertable5Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertable5Key">
-<xs:selector xpath=".//vertable5"/>
-<xs:field xpath="id1"/>
+<xs:selector xpath=".//vertable5" />
+<xs:field xpath="id1" />
 </xs:key>
 <xs:unique name="vertable5Key_0">
-<xs:selector xpath=".//vertable5"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertable5" />
+<xs:field xpath="name" />
 </xs:unique>
 <xs:unique name="vertable5Key_1">
-<xs:selector xpath=".//vertable5"/>
-<xs:field xpath="id2"/>
-<xs:field xpath="idb1"/>
-<xs:field xpath="idb2"/>
+<xs:selector xpath=".//vertable5" />
+<xs:field xpath="id2" />
+<xs:field xpath="idb1" />
+<xs:field xpath="idb2" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertable5Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="guest_vertable_vertablelookup5" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable5_guest_vertable_vertablelookup5" refer="guest:vertablelookup5_vertable5AKey">
-<xs:selector xpath=".//vertable5"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable5" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="guest_vertable_vertablelookupb5" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable5_guest_vertable_vertablelookupb5" refer="guest:vertablelookupb5_vertable5AKey">
-<xs:selector xpath=".//vertable5"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable5" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
 <xs:restriction base="fdo:int32">
-<xs:maxExclusive value="5"/>
+<xs:maxExclusive value="5" />
 </xs:restriction>
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1392,40 +1392,40 @@
 </xs:complexType>
 <xs:element name="vertablelookup1" type="guest:vertablelookup1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookup1Key">
-<xs:selector xpath=".//vertablelookup1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookup1" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookup1_vertable1AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:unique name="vertablelookup1Key_0">
-<xs:selector xpath=".//vertablelookup1"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertablelookup1" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertablelookup1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1435,40 +1435,40 @@
 </xs:complexType>
 <xs:element name="vertablelookup2" type="guest:vertablelookup2Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookup2Key">
-<xs:selector xpath=".//vertablelookup2"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookup2" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookup2_vertable2AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:unique name="vertablelookup2Key_0">
-<xs:selector xpath=".//vertablelookup2"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertablelookup2" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertablelookup2Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1478,40 +1478,40 @@
 </xs:complexType>
 <xs:element name="vertablelookup3" type="guest:vertablelookup3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookup3Key">
-<xs:selector xpath=".//vertablelookup3"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookup3" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookup3_vertable3AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:unique name="vertablelookup3Key_0">
-<xs:selector xpath=".//vertablelookup3"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertablelookup3" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertablelookup3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1521,40 +1521,40 @@
 </xs:complexType>
 <xs:element name="vertablelookup4" type="guest:vertablelookup4Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookup4Key">
-<xs:selector xpath=".//vertablelookup4"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookup4" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookup4_vertable4AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:unique name="vertablelookup4Key_0">
-<xs:selector xpath=".//vertablelookup4"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertablelookup4" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertablelookup4Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1564,40 +1564,40 @@
 </xs:complexType>
 <xs:element name="vertablelookup5" type="guest:vertablelookup5Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookup5Key">
-<xs:selector xpath=".//vertablelookup5"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookup5" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookup5_vertable5AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:unique name="vertablelookup5Key_0">
-<xs:selector xpath=".//vertablelookup5"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertablelookup5" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertablelookup5Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1607,46 +1607,46 @@
 </xs:complexType>
 <xs:element name="vertablelookupb1" type="guest:vertablelookupb1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookupb1Key">
-<xs:selector xpath=".//vertablelookupb1"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookupb1" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookupb1_vertable1AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="vertablelookupb1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1656,46 +1656,46 @@
 </xs:complexType>
 <xs:element name="vertablelookupb2" type="guest:vertablelookupb2Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookupb2Key">
-<xs:selector xpath=".//vertablelookupb2"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookupb2" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookupb2_vertable2AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="vertablelookupb2Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1705,46 +1705,46 @@
 </xs:complexType>
 <xs:element name="vertablelookupb3" type="guest:vertablelookupb3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookupb3Key">
-<xs:selector xpath=".//vertablelookupb3"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookupb3" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookupb3_vertable3AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="vertablelookupb3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1754,46 +1754,46 @@
 </xs:complexType>
 <xs:element name="vertablelookupb4" type="guest:vertablelookupb4Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookupb4Key">
-<xs:selector xpath=".//vertablelookupb4"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookupb4" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookupb4_vertable4AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="vertablelookupb4Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1803,46 +1803,46 @@
 </xs:complexType>
 <xs:element name="vertablelookupb5" type="guest:vertablelookupb5Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookupb5Key">
-<xs:selector xpath=".//vertablelookupb5"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookupb5" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookupb5_vertable5AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="vertablelookupb5Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1853,228 +1853,228 @@
 </xs:schema>
 <SchemaMapping xmlns:rdb="http://fdordbms.osgeo.org/schemas" xmlns="http://www.autodesk.com/isd/fdo/SQLServerSpatialProvider" textInRow="NotInRow" provider="OSGeo.SQLServerSpatial.3.5" name="dbo">
 <complexType name="rtable1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable1" name="dbo.rtable1"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable1" name="dbo.rtable1" />
 </complexType>
 <complexType name="rtable2Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable2" name="dbo.rtable2"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable2" name="dbo.rtable2" />
 </complexType>
 <complexType name="rtable7Type" identityIsGloballyUnique="false" identitySeed="1" identityIncrement="1" identityPropertyName="TABLE7_ID12345678901234567890">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable7" name="dbo.rtable7"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable7" name="dbo.rtable7" />
 </complexType>
 <complexType name="table1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table1" name="dbo.table1"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table1" name="dbo.table1" />
 </complexType>
 <complexType name="table3Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table3" name="dbo.table3"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table3" name="dbo.table3" />
 </complexType>
 <complexType name="table4Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table4" name="dbo.table4"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table4" name="dbo.table4" />
 </complexType>
 <complexType name="table7Type" identityIsGloballyUnique="false" identitySeed="1" identityIncrement="1" identityPropertyName="ID">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table7" name="dbo.table7"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table7" name="dbo.table7" />
 </complexType>
 <complexType name="view1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_view1" name="dbo.view1"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_view1" name="dbo.view1" />
 </complexType>
 <complexType name="view3Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_view3" name="dbo.view3"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_view3" name="dbo.view3" />
 </complexType>
 </SchemaMapping>
 <SchemaMapping xmlns:rdb="http://fdordbms.osgeo.org/schemas" xmlns="http://www.autodesk.com/isd/fdo/SQLServerSpatialProvider" textInRow="NotInRow" provider="OSGeo.SQLServerSpatial.3.5" name="guest">
 <complexType name="vertable1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable1" name="guest.vertable1"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable1" name="guest.vertable1" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="idb1">
-<Column name="idb1"/>
+<Column name="idb1" />
 </element>
 <element name="idb2">
-<Column name="idb2"/>
+<Column name="idb2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertable2Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable2" name="guest.vertable2"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable2" name="guest.vertable2" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="idb1">
-<Column name="idb1"/>
+<Column name="idb1" />
 </element>
 <element name="idb2">
-<Column name="idb2"/>
+<Column name="idb2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertable3Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable3" name="guest.vertable3"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable3" name="guest.vertable3" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="idb1">
-<Column name="idb1"/>
+<Column name="idb1" />
 </element>
 <element name="idb2">
-<Column name="idb2"/>
+<Column name="idb2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertable4Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable4" name="guest.vertable4"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable4" name="guest.vertable4" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="idb1">
-<Column name="idb1"/>
+<Column name="idb1" />
 </element>
 <element name="idb2">
-<Column name="idb2"/>
+<Column name="idb2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertable5Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable5" name="guest.vertable5"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable5" name="guest.vertable5" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="idb1">
-<Column name="idb1"/>
+<Column name="idb1" />
 </element>
 <element name="idb2">
-<Column name="idb2"/>
+<Column name="idb2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookup1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup1" name="guest.vertablelookup1"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup1" name="guest.vertablelookup1" />
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookup2Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup2" name="guest.vertablelookup2"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup2" name="guest.vertablelookup2" />
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookup3Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup3" name="guest.vertablelookup3"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup3" name="guest.vertablelookup3" />
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookup4Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup4" name="guest.vertablelookup4"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup4" name="guest.vertablelookup4" />
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookup5Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup5" name="guest.vertablelookup5"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup5" name="guest.vertablelookup5" />
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookupb1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb1" name="guest.vertablelookupb1"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb1" name="guest.vertablelookupb1" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookupb2Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb2" name="guest.vertablelookupb2"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb2" name="guest.vertablelookupb2" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookupb3Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb3" name="guest.vertablelookupb3"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb3" name="guest.vertablelookupb3" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookupb4Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb4" name="guest.vertablelookupb4"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb4" name="guest.vertablelookupb4" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookupb5Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb5" name="guest.vertablelookupb5"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb5" name="guest.vertablelookupb5" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 </SchemaMapping>
-</fdo:DataStore>
+</fdo:DataStore>
\ No newline at end of file

Modified: trunk/Tools/Maestro/TestData/gen_default1_SqlServer2005_master.xml
===================================================================
--- trunk/Tools/Maestro/TestData/gen_default1_SqlServer2005_master.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/TestData/gen_default1_SqlServer2005_master.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -2,66 +2,66 @@
 <fdo:DataStore xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:fds="http://fdo.osgeo.org/schemas/fds">
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://fdo.osgeo.org/schemas/feature/dbo" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:gml="http://www.opengis.net/gml" xmlns:dbo="http://fdo.osgeo.org/schemas/feature/dbo" elementFormDefault="qualified" attributeFormDefault="unqualified">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:element name="rtable1" type="dbo:rtable1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="rtable1Key">
-<xs:selector xpath=".//rtable1"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//rtable1" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="rtable1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="FK_RTABLE1_TABLE1" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="dbo_rtable1_FK_RTABLE1_TABLE1" refer="dbo:table1_rtable1AKey">
-<xs:selector xpath=".//rtable1"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//rtable1" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:keyref>
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
@@ -70,115 +70,115 @@
 </xs:complexType>
 <xs:element name="rtable2" type="dbo:rtable2Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="rtable2Key">
-<xs:selector xpath=".//rtable2"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//rtable2" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="rtable2Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="FK_RTABLE2_TABLE1" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="TABLE1_ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="dbo_rtable2_FK_RTABLE2_TABLE1" refer="dbo:table1_rtable2AKey">
-<xs:selector xpath=".//rtable2"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//rtable2" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:keyref>
 </xs:element>
 <xs:element name="FK_RTABLE2_TABLE3" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="TABLE3_KEY1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE3_KEY2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="dbo_rtable2_FK_RTABLE2_TABLE3" refer="dbo:table3_rtable2AKey">
-<xs:selector xpath=".//rtable2"/>
-<xs:field xpath="KEY1"/>
-<xs:field xpath="KEY2"/>
+<xs:selector xpath=".//rtable2" />
+<xs:field xpath="KEY1" />
+<xs:field xpath="KEY2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE1_ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="TABLE3_KEY1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE3_KEY2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -188,45 +188,45 @@
 </xs:complexType>
 <xs:element name="rtable7" type="dbo:rtable7Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="rtable7Key">
-<xs:selector xpath=".//rtable7"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//rtable7" />
+<xs:field xpath="ID" />
 </xs:key>
 <xs:unique name="rtable7Key_0">
-<xs:selector xpath=".//rtable7"/>
-<xs:field xpath="TABLE7_ID12345678901234567890"/>
+<xs:selector xpath=".//rtable7" />
+<xs:field xpath="TABLE7_ID12345678901234567890" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="rtable7Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE7_ID12345678901234567890" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
@@ -235,315 +235,315 @@
 </xs:complexType>
 <xs:element name="table1" type="dbo:table1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table1Key">
-<xs:selector xpath=".//table1"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//table1" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:key>
 <xs:key name="table1_rtable1AKey">
-<xs:selector xpath=".//dbo"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//dbo" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:key>
 <xs:key name="table1_rtable2AKey">
-<xs:selector xpath=".//dbo"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//dbo" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:key>
 </xs:element>
 <xs:complexType name="table1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="BINARY_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BLOB_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BOOL_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="fdo:byte" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="fdo:byte" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="CHAR1_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="1"/>
+<xs:maxLength value="1" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="CHAR5_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="5"/>
+<xs:maxLength value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="DECIMAL_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="5"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="DOUBLE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INSERT_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="25"/>
+<xs:maxLength value="25" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="INT16_COLUMN345678901234567890" minOccurs="0">
 <xs:simpleType>
 <xs:restriction base="fdo:int16">
-<xs:maxExclusive value="20000"/>
+<xs:maxExclusive value="20000" />
 </xs:restriction>
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT32_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT64_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="LONG_STRING" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="8000"/>
+<xs:maxLength value="8000" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="MONEY_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="19"/>
-<xs:fractionDigits value="4"/>
+<xs:totalDigits value="19" />
+<xs:fractionDigits value="4" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NCHAR_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NEW_GEOM_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="NTEXT_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="1073741823"/>
+<xs:maxLength value="1073741823" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NUMERIC_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="5"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NVARCHAR_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="OBJECT_NAME" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="128"/>
+<xs:maxLength value="128" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="REAL_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="SINGLE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="SMALLDATETIME_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:dateTime"/>
+<xs:restriction base="xs:dateTime" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="SMALLMONEY_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="4"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="4" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TEXT_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="2147483647"/>
+<xs:maxLength value="2147483647" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TIMESTAMP_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:dateTime"/>
+<xs:restriction base="xs:dateTime" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="TINYINT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="fdo:byte" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="UNIQUEID_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="36"/>
+<xs:maxLength value="36" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="VARBINARY_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
@@ -552,48 +552,48 @@
 </xs:complexType>
 <xs:element name="table3" type="dbo:table3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table3Key">
-<xs:selector xpath=".//table3"/>
-<xs:field xpath="KEY1"/>
-<xs:field xpath="KEY2"/>
+<xs:selector xpath=".//table3" />
+<xs:field xpath="KEY1" />
+<xs:field xpath="KEY2" />
 </xs:key>
 <xs:key name="table3_rtable2AKey">
-<xs:selector xpath=".//dbo"/>
-<xs:field xpath="KEY1"/>
-<xs:field xpath="KEY2"/>
+<xs:selector xpath=".//dbo" />
+<xs:field xpath="KEY1" />
+<xs:field xpath="KEY2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="table3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="DOUBLE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="KEY1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="KEY2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -603,48 +603,48 @@
 </xs:complexType>
 <xs:element name="table4" type="dbo:table4Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table4Key">
-<xs:selector xpath=".//table4"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//table4" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="table4Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="GEOM_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="fdo:int16" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -654,32 +654,32 @@
 </xs:complexType>
 <xs:element name="table7" type="dbo:table7Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table7Key">
-<xs:selector xpath=".//table7"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//table7" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="table7Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -689,42 +689,42 @@
 </xs:complexType>
 <xs:element name="view1" type="dbo:view1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="view1Key">
-<xs:selector xpath=".//view1"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//view1" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:key>
 </xs:element>
 <xs:complexType name="view1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="fdo:byte" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="DEC_COL_RENAME" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="5"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
@@ -733,48 +733,48 @@
 </xs:complexType>
 <xs:element name="view3" type="dbo:view3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="view3Key">
-<xs:selector xpath=".//view3"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//view3" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="view3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="GEOM_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="fdo:int16" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -785,117 +785,117 @@
 </xs:schema>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://fdo.osgeo.org/schemas/feature/guest" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:gml="http://www.opengis.net/gml" xmlns:guest="http://fdo.osgeo.org/schemas/feature/guest" elementFormDefault="qualified" attributeFormDefault="unqualified">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:element name="vertable1" type="guest:vertable1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertable1Key">
-<xs:selector xpath=".//vertable1"/>
-<xs:field xpath="id1"/>
+<xs:selector xpath=".//vertable1" />
+<xs:field xpath="id1" />
 </xs:key>
 <xs:unique name="vertable1Key_0">
-<xs:selector xpath=".//vertable1"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertable1" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertable1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="guest_vertable_vertablelookup1" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable1_guest_vertable_vertablelookup1" refer="guest:vertablelookup1_vertable1AKey">
-<xs:selector xpath=".//vertable1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable1" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="guest_vertable_vertablelookupb1" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable1_guest_vertable_vertablelookupb1" refer="guest:vertablelookupb1_vertable1AKey">
-<xs:selector xpath=".//vertable1"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable1" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
 <xs:restriction base="fdo:int32">
-<xs:maxExclusive value="1"/>
+<xs:maxExclusive value="1" />
 </xs:restriction>
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -905,113 +905,113 @@
 </xs:complexType>
 <xs:element name="vertable2" type="guest:vertable2Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertable2Key">
-<xs:selector xpath=".//vertable2"/>
-<xs:field xpath="id1"/>
+<xs:selector xpath=".//vertable2" />
+<xs:field xpath="id1" />
 </xs:key>
 <xs:unique name="vertable2Key_0">
-<xs:selector xpath=".//vertable2"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertable2" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertable2Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="guest_vertable_vertablelookup2" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable2_guest_vertable_vertablelookup2" refer="guest:vertablelookup2_vertable2AKey">
-<xs:selector xpath=".//vertable2"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable2" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="guest_vertable_vertablelookupb2" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable2_guest_vertable_vertablelookupb2" refer="guest:vertablelookupb2_vertable2AKey">
-<xs:selector xpath=".//vertable2"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable2" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
 <xs:restriction base="fdo:int32">
-<xs:maxExclusive value="2"/>
+<xs:maxExclusive value="2" />
 </xs:restriction>
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1021,113 +1021,113 @@
 </xs:complexType>
 <xs:element name="vertable3" type="guest:vertable3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertable3Key">
-<xs:selector xpath=".//vertable3"/>
-<xs:field xpath="id1"/>
+<xs:selector xpath=".//vertable3" />
+<xs:field xpath="id1" />
 </xs:key>
 <xs:unique name="vertable3Key_0">
-<xs:selector xpath=".//vertable3"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertable3" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertable3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="guest_vertable_vertablelookup3" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable3_guest_vertable_vertablelookup3" refer="guest:vertablelookup3_vertable3AKey">
-<xs:selector xpath=".//vertable3"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable3" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="guest_vertable_vertablelookupb3" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable3_guest_vertable_vertablelookupb3" refer="guest:vertablelookupb3_vertable3AKey">
-<xs:selector xpath=".//vertable3"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable3" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
 <xs:restriction base="fdo:int32">
-<xs:maxExclusive value="3"/>
+<xs:maxExclusive value="3" />
 </xs:restriction>
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1137,119 +1137,119 @@
 </xs:complexType>
 <xs:element name="vertable4" type="guest:vertable4Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertable4Key">
-<xs:selector xpath=".//vertable4"/>
-<xs:field xpath="id1"/>
+<xs:selector xpath=".//vertable4" />
+<xs:field xpath="id1" />
 </xs:key>
 <xs:unique name="vertable4Key_0">
-<xs:selector xpath=".//vertable4"/>
-<xs:field xpath="id2"/>
-<xs:field xpath="idb1"/>
-<xs:field xpath="idb2"/>
+<xs:selector xpath=".//vertable4" />
+<xs:field xpath="id2" />
+<xs:field xpath="idb1" />
+<xs:field xpath="idb2" />
 </xs:unique>
 <xs:unique name="vertable4Key_1">
-<xs:selector xpath=".//vertable4"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertable4" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertable4Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="guest_vertable_vertablelookup4" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable4_guest_vertable_vertablelookup4" refer="guest:vertablelookup4_vertable4AKey">
-<xs:selector xpath=".//vertable4"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable4" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="guest_vertable_vertablelookupb4" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable4_guest_vertable_vertablelookupb4" refer="guest:vertablelookupb4_vertable4AKey">
-<xs:selector xpath=".//vertable4"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable4" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
 <xs:restriction base="fdo:int32">
-<xs:maxExclusive value="4"/>
+<xs:maxExclusive value="4" />
 </xs:restriction>
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1259,119 +1259,119 @@
 </xs:complexType>
 <xs:element name="vertable5" type="guest:vertable5Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertable5Key">
-<xs:selector xpath=".//vertable5"/>
-<xs:field xpath="id1"/>
+<xs:selector xpath=".//vertable5" />
+<xs:field xpath="id1" />
 </xs:key>
 <xs:unique name="vertable5Key_0">
-<xs:selector xpath=".//vertable5"/>
-<xs:field xpath="id2"/>
-<xs:field xpath="idb1"/>
-<xs:field xpath="idb2"/>
+<xs:selector xpath=".//vertable5" />
+<xs:field xpath="id2" />
+<xs:field xpath="idb1" />
+<xs:field xpath="idb2" />
 </xs:unique>
 <xs:unique name="vertable5Key_1">
-<xs:selector xpath=".//vertable5"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertable5" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertable5Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="guest_vertable_vertablelookup5" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable5_guest_vertable_vertablelookup5" refer="guest:vertablelookup5_vertable5AKey">
-<xs:selector xpath=".//vertable5"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable5" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="guest_vertable_vertablelookupb5" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable5_guest_vertable_vertablelookupb5" refer="guest:vertablelookupb5_vertable5AKey">
-<xs:selector xpath=".//vertable5"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable5" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
 <xs:restriction base="fdo:int32">
-<xs:maxExclusive value="5"/>
+<xs:maxExclusive value="5" />
 </xs:restriction>
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1381,40 +1381,40 @@
 </xs:complexType>
 <xs:element name="vertablelookup1" type="guest:vertablelookup1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookup1Key">
-<xs:selector xpath=".//vertablelookup1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookup1" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookup1_vertable1AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:unique name="vertablelookup1Key_0">
-<xs:selector xpath=".//vertablelookup1"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertablelookup1" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertablelookup1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1424,40 +1424,40 @@
 </xs:complexType>
 <xs:element name="vertablelookup2" type="guest:vertablelookup2Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookup2Key">
-<xs:selector xpath=".//vertablelookup2"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookup2" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookup2_vertable2AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:unique name="vertablelookup2Key_0">
-<xs:selector xpath=".//vertablelookup2"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertablelookup2" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertablelookup2Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1467,40 +1467,40 @@
 </xs:complexType>
 <xs:element name="vertablelookup3" type="guest:vertablelookup3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookup3Key">
-<xs:selector xpath=".//vertablelookup3"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookup3" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookup3_vertable3AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:unique name="vertablelookup3Key_0">
-<xs:selector xpath=".//vertablelookup3"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertablelookup3" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertablelookup3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1510,40 +1510,40 @@
 </xs:complexType>
 <xs:element name="vertablelookup4" type="guest:vertablelookup4Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookup4Key">
-<xs:selector xpath=".//vertablelookup4"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookup4" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookup4_vertable4AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:unique name="vertablelookup4Key_0">
-<xs:selector xpath=".//vertablelookup4"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertablelookup4" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertablelookup4Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1553,40 +1553,40 @@
 </xs:complexType>
 <xs:element name="vertablelookup5" type="guest:vertablelookup5Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookup5Key">
-<xs:selector xpath=".//vertablelookup5"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookup5" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookup5_vertable5AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:unique name="vertablelookup5Key_0">
-<xs:selector xpath=".//vertablelookup5"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertablelookup5" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertablelookup5Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1596,46 +1596,46 @@
 </xs:complexType>
 <xs:element name="vertablelookupb1" type="guest:vertablelookupb1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookupb1Key">
-<xs:selector xpath=".//vertablelookupb1"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookupb1" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookupb1_vertable1AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="vertablelookupb1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1645,46 +1645,46 @@
 </xs:complexType>
 <xs:element name="vertablelookupb2" type="guest:vertablelookupb2Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookupb2Key">
-<xs:selector xpath=".//vertablelookupb2"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookupb2" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookupb2_vertable2AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="vertablelookupb2Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1694,46 +1694,46 @@
 </xs:complexType>
 <xs:element name="vertablelookupb3" type="guest:vertablelookupb3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookupb3Key">
-<xs:selector xpath=".//vertablelookupb3"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookupb3" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookupb3_vertable3AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="vertablelookupb3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1743,46 +1743,46 @@
 </xs:complexType>
 <xs:element name="vertablelookupb4" type="guest:vertablelookupb4Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookupb4Key">
-<xs:selector xpath=".//vertablelookupb4"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookupb4" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookupb4_vertable4AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="vertablelookupb4Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1792,46 +1792,46 @@
 </xs:complexType>
 <xs:element name="vertablelookupb5" type="guest:vertablelookupb5Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookupb5Key">
-<xs:selector xpath=".//vertablelookupb5"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookupb5" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookupb5_vertable5AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="vertablelookupb5Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1842,228 +1842,228 @@
 </xs:schema>
 <SchemaMapping xmlns:rdb="http://fdordbms.osgeo.org/schemas" xmlns="http://www.autodesk.com/isd/fdo/SqlServerProvider" textInRow="NotInRow" provider="Autodesk.SqlServer.3.5" name="dbo">
 <complexType name="rtable1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable1" name="dbo.rtable1"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable1" name="dbo.rtable1" />
 </complexType>
 <complexType name="rtable2Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable2" name="dbo.rtable2"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable2" name="dbo.rtable2" />
 </complexType>
 <complexType name="rtable7Type" identityIsGloballyUnique="false" identitySeed="1" identityIncrement="1" identityPropertyName="TABLE7_ID12345678901234567890">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable7" name="dbo.rtable7"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable7" name="dbo.rtable7" />
 </complexType>
 <complexType name="table1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table1" name="dbo.table1"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table1" name="dbo.table1" />
 </complexType>
 <complexType name="table3Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table3" name="dbo.table3"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table3" name="dbo.table3" />
 </complexType>
 <complexType name="table4Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table4" name="dbo.table4"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table4" name="dbo.table4" />
 </complexType>
 <complexType name="table7Type" identityIsGloballyUnique="false" identitySeed="1" identityIncrement="1" identityPropertyName="ID">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table7" name="dbo.table7"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table7" name="dbo.table7" />
 </complexType>
 <complexType name="view1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_view1" name="dbo.view1"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_view1" name="dbo.view1" />
 </complexType>
 <complexType name="view3Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_view3" name="dbo.view3"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_view3" name="dbo.view3" />
 </complexType>
 </SchemaMapping>
 <SchemaMapping xmlns:rdb="http://fdordbms.osgeo.org/schemas" xmlns="http://www.autodesk.com/isd/fdo/SqlServerProvider" textInRow="NotInRow" provider="Autodesk.SqlServer.3.5" name="guest">
 <complexType name="vertable1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable1" name="guest.vertable1"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable1" name="guest.vertable1" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="idb1">
-<Column name="idb1"/>
+<Column name="idb1" />
 </element>
 <element name="idb2">
-<Column name="idb2"/>
+<Column name="idb2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertable2Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable2" name="guest.vertable2"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable2" name="guest.vertable2" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="idb1">
-<Column name="idb1"/>
+<Column name="idb1" />
 </element>
 <element name="idb2">
-<Column name="idb2"/>
+<Column name="idb2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertable3Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable3" name="guest.vertable3"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable3" name="guest.vertable3" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="idb1">
-<Column name="idb1"/>
+<Column name="idb1" />
 </element>
 <element name="idb2">
-<Column name="idb2"/>
+<Column name="idb2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertable4Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable4" name="guest.vertable4"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable4" name="guest.vertable4" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="idb1">
-<Column name="idb1"/>
+<Column name="idb1" />
 </element>
 <element name="idb2">
-<Column name="idb2"/>
+<Column name="idb2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertable5Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable5" name="guest.vertable5"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable5" name="guest.vertable5" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="idb1">
-<Column name="idb1"/>
+<Column name="idb1" />
 </element>
 <element name="idb2">
-<Column name="idb2"/>
+<Column name="idb2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookup1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup1" name="guest.vertablelookup1"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup1" name="guest.vertablelookup1" />
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookup2Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup2" name="guest.vertablelookup2"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup2" name="guest.vertablelookup2" />
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookup3Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup3" name="guest.vertablelookup3"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup3" name="guest.vertablelookup3" />
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookup4Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup4" name="guest.vertablelookup4"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup4" name="guest.vertablelookup4" />
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookup5Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup5" name="guest.vertablelookup5"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup5" name="guest.vertablelookup5" />
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookupb1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb1" name="guest.vertablelookupb1"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb1" name="guest.vertablelookupb1" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookupb2Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb2" name="guest.vertablelookupb2"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb2" name="guest.vertablelookupb2" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookupb3Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb3" name="guest.vertablelookupb3"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb3" name="guest.vertablelookupb3" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookupb4Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb4" name="guest.vertablelookupb4"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb4" name="guest.vertablelookupb4" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookupb5Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb5" name="guest.vertablelookupb5"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb5" name="guest.vertablelookupb5" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 </SchemaMapping>
-</fdo:DataStore>
+</fdo:DataStore>
\ No newline at end of file

Modified: trunk/Tools/Maestro/TestData/gen_default1_SqlServer2008_master.xml
===================================================================
--- trunk/Tools/Maestro/TestData/gen_default1_SqlServer2008_master.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/TestData/gen_default1_SqlServer2008_master.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -2,66 +2,66 @@
 <fdo:DataStore xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:fds="http://fdo.osgeo.org/schemas/fds">
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://fdo.osgeo.org/schemas/feature/dbo" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:gml="http://www.opengis.net/gml" xmlns:dbo="http://fdo.osgeo.org/schemas/feature/dbo" elementFormDefault="qualified" attributeFormDefault="unqualified">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:element name="rtable1" type="dbo:rtable1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="rtable1Key">
-<xs:selector xpath=".//rtable1"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//rtable1" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="rtable1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="FK_RTABLE1_TABLE1" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="dbo_rtable1_FK_RTABLE1_TABLE1" refer="dbo:table1_rtable1AKey">
-<xs:selector xpath=".//rtable1"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//rtable1" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:keyref>
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
@@ -70,115 +70,115 @@
 </xs:complexType>
 <xs:element name="rtable2" type="dbo:rtable2Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="rtable2Key">
-<xs:selector xpath=".//rtable2"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//rtable2" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="rtable2Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="FK_RTABLE2_TABLE1" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="TABLE1_ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="dbo_rtable2_FK_RTABLE2_TABLE1" refer="dbo:table1_rtable2AKey">
-<xs:selector xpath=".//rtable2"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//rtable2" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:keyref>
 </xs:element>
 <xs:element name="FK_RTABLE2_TABLE3" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="TABLE3_KEY1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE3_KEY2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="dbo_rtable2_FK_RTABLE2_TABLE3" refer="dbo:table3_rtable2AKey">
-<xs:selector xpath=".//rtable2"/>
-<xs:field xpath="KEY1"/>
-<xs:field xpath="KEY2"/>
+<xs:selector xpath=".//rtable2" />
+<xs:field xpath="KEY1" />
+<xs:field xpath="KEY2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE1_ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="TABLE3_KEY1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE3_KEY2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -188,45 +188,45 @@
 </xs:complexType>
 <xs:element name="rtable7" type="dbo:rtable7Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="rtable7Key">
-<xs:selector xpath=".//rtable7"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//rtable7" />
+<xs:field xpath="ID" />
 </xs:key>
 <xs:unique name="rtable7Key_0">
-<xs:selector xpath=".//rtable7"/>
-<xs:field xpath="TABLE7_ID12345678901234567890"/>
+<xs:selector xpath=".//rtable7" />
+<xs:field xpath="TABLE7_ID12345678901234567890" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="rtable7Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE7_ID12345678901234567890" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
@@ -235,315 +235,315 @@
 </xs:complexType>
 <xs:element name="table1" type="dbo:table1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table1Key">
-<xs:selector xpath=".//table1"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//table1" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:key>
 <xs:key name="table1_rtable1AKey">
-<xs:selector xpath=".//dbo"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//dbo" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:key>
 <xs:key name="table1_rtable2AKey">
-<xs:selector xpath=".//dbo"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//dbo" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:key>
 </xs:element>
 <xs:complexType name="table1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="BINARY_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BLOB_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BOOL_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="fdo:byte" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="fdo:byte" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="CHAR1_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="1"/>
+<xs:maxLength value="1" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="CHAR5_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="5"/>
+<xs:maxLength value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="DECIMAL_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="5"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="DOUBLE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INSERT_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="25"/>
+<xs:maxLength value="25" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="INT16_COLUMN345678901234567890" minOccurs="0">
 <xs:simpleType>
 <xs:restriction base="fdo:int16">
-<xs:maxExclusive value="20000"/>
+<xs:maxExclusive value="20000" />
 </xs:restriction>
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT32_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT64_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="LONG_STRING" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="8000"/>
+<xs:maxLength value="8000" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="MONEY_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="19"/>
-<xs:fractionDigits value="4"/>
+<xs:totalDigits value="19" />
+<xs:fractionDigits value="4" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NCHAR_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NEW_GEOM_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="NTEXT_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="1073741823"/>
+<xs:maxLength value="1073741823" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NUMERIC_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="5"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NVARCHAR_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="OBJECT_NAME" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="128"/>
+<xs:maxLength value="128" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="REAL_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="SINGLE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="SMALLDATETIME_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:dateTime"/>
+<xs:restriction base="xs:dateTime" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="SMALLMONEY_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="4"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="4" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TEXT_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="2147483647"/>
+<xs:maxLength value="2147483647" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TIMESTAMP_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:dateTime"/>
+<xs:restriction base="xs:dateTime" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="TINYINT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="fdo:byte" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="UNIQUEID_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="36"/>
+<xs:maxLength value="36" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="VARBINARY_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
@@ -552,48 +552,48 @@
 </xs:complexType>
 <xs:element name="table3" type="dbo:table3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table3Key">
-<xs:selector xpath=".//table3"/>
-<xs:field xpath="KEY1"/>
-<xs:field xpath="KEY2"/>
+<xs:selector xpath=".//table3" />
+<xs:field xpath="KEY1" />
+<xs:field xpath="KEY2" />
 </xs:key>
 <xs:key name="table3_rtable2AKey">
-<xs:selector xpath=".//dbo"/>
-<xs:field xpath="KEY1"/>
-<xs:field xpath="KEY2"/>
+<xs:selector xpath=".//dbo" />
+<xs:field xpath="KEY1" />
+<xs:field xpath="KEY2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="table3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="DOUBLE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="KEY1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="KEY2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -603,48 +603,48 @@
 </xs:complexType>
 <xs:element name="table4" type="dbo:table4Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table4Key">
-<xs:selector xpath=".//table4"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//table4" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="table4Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="GEOM_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="fdo:int16" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -654,32 +654,32 @@
 </xs:complexType>
 <xs:element name="table7" type="dbo:table7Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table7Key">
-<xs:selector xpath=".//table7"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//table7" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="table7Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -689,42 +689,42 @@
 </xs:complexType>
 <xs:element name="view1" type="dbo:view1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="view1Key">
-<xs:selector xpath=".//view1"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//view1" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:key>
 </xs:element>
 <xs:complexType name="view1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="fdo:byte" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="DEC_COL_RENAME" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="5"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
@@ -733,48 +733,48 @@
 </xs:complexType>
 <xs:element name="view3" type="dbo:view3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="view3Key">
-<xs:selector xpath=".//view3"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//view3" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="view3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="GEOM_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="fdo:int16" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -785,117 +785,117 @@
 </xs:schema>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://fdo.osgeo.org/schemas/feature/guest" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:gml="http://www.opengis.net/gml" xmlns:guest="http://fdo.osgeo.org/schemas/feature/guest" elementFormDefault="qualified" attributeFormDefault="unqualified">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:element name="vertable1" type="guest:vertable1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertable1Key">
-<xs:selector xpath=".//vertable1"/>
-<xs:field xpath="id1"/>
+<xs:selector xpath=".//vertable1" />
+<xs:field xpath="id1" />
 </xs:key>
 <xs:unique name="vertable1Key_0">
-<xs:selector xpath=".//vertable1"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertable1" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertable1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="guest_vertable_vertablelookup1" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable1_guest_vertable_vertablelookup1" refer="guest:vertablelookup1_vertable1AKey">
-<xs:selector xpath=".//vertable1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable1" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="guest_vertable_vertablelookupb1" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable1_guest_vertable_vertablelookupb1" refer="guest:vertablelookupb1_vertable1AKey">
-<xs:selector xpath=".//vertable1"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable1" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
 <xs:restriction base="fdo:int32">
-<xs:maxExclusive value="1"/>
+<xs:maxExclusive value="1" />
 </xs:restriction>
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -905,113 +905,113 @@
 </xs:complexType>
 <xs:element name="vertable2" type="guest:vertable2Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertable2Key">
-<xs:selector xpath=".//vertable2"/>
-<xs:field xpath="id1"/>
+<xs:selector xpath=".//vertable2" />
+<xs:field xpath="id1" />
 </xs:key>
 <xs:unique name="vertable2Key_0">
-<xs:selector xpath=".//vertable2"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertable2" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertable2Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="guest_vertable_vertablelookup2" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable2_guest_vertable_vertablelookup2" refer="guest:vertablelookup2_vertable2AKey">
-<xs:selector xpath=".//vertable2"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable2" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="guest_vertable_vertablelookupb2" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable2_guest_vertable_vertablelookupb2" refer="guest:vertablelookupb2_vertable2AKey">
-<xs:selector xpath=".//vertable2"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable2" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
 <xs:restriction base="fdo:int32">
-<xs:maxExclusive value="2"/>
+<xs:maxExclusive value="2" />
 </xs:restriction>
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1021,113 +1021,113 @@
 </xs:complexType>
 <xs:element name="vertable3" type="guest:vertable3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertable3Key">
-<xs:selector xpath=".//vertable3"/>
-<xs:field xpath="id1"/>
+<xs:selector xpath=".//vertable3" />
+<xs:field xpath="id1" />
 </xs:key>
 <xs:unique name="vertable3Key_0">
-<xs:selector xpath=".//vertable3"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertable3" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertable3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="guest_vertable_vertablelookup3" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable3_guest_vertable_vertablelookup3" refer="guest:vertablelookup3_vertable3AKey">
-<xs:selector xpath=".//vertable3"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable3" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="guest_vertable_vertablelookupb3" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable3_guest_vertable_vertablelookupb3" refer="guest:vertablelookupb3_vertable3AKey">
-<xs:selector xpath=".//vertable3"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable3" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
 <xs:restriction base="fdo:int32">
-<xs:maxExclusive value="3"/>
+<xs:maxExclusive value="3" />
 </xs:restriction>
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1137,119 +1137,119 @@
 </xs:complexType>
 <xs:element name="vertable4" type="guest:vertable4Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertable4Key">
-<xs:selector xpath=".//vertable4"/>
-<xs:field xpath="id1"/>
+<xs:selector xpath=".//vertable4" />
+<xs:field xpath="id1" />
 </xs:key>
 <xs:unique name="vertable4Key_0">
-<xs:selector xpath=".//vertable4"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertable4" />
+<xs:field xpath="name" />
 </xs:unique>
 <xs:unique name="vertable4Key_1">
-<xs:selector xpath=".//vertable4"/>
-<xs:field xpath="id2"/>
-<xs:field xpath="idb1"/>
-<xs:field xpath="idb2"/>
+<xs:selector xpath=".//vertable4" />
+<xs:field xpath="id2" />
+<xs:field xpath="idb1" />
+<xs:field xpath="idb2" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertable4Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="guest_vertable_vertablelookup4" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable4_guest_vertable_vertablelookup4" refer="guest:vertablelookup4_vertable4AKey">
-<xs:selector xpath=".//vertable4"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable4" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="guest_vertable_vertablelookupb4" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable4_guest_vertable_vertablelookupb4" refer="guest:vertablelookupb4_vertable4AKey">
-<xs:selector xpath=".//vertable4"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable4" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
 <xs:restriction base="fdo:int32">
-<xs:maxExclusive value="4"/>
+<xs:maxExclusive value="4" />
 </xs:restriction>
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1259,119 +1259,119 @@
 </xs:complexType>
 <xs:element name="vertable5" type="guest:vertable5Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertable5Key">
-<xs:selector xpath=".//vertable5"/>
-<xs:field xpath="id1"/>
+<xs:selector xpath=".//vertable5" />
+<xs:field xpath="id1" />
 </xs:key>
 <xs:unique name="vertable5Key_0">
-<xs:selector xpath=".//vertable5"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertable5" />
+<xs:field xpath="name" />
 </xs:unique>
 <xs:unique name="vertable5Key_1">
-<xs:selector xpath=".//vertable5"/>
-<xs:field xpath="id2"/>
-<xs:field xpath="idb1"/>
-<xs:field xpath="idb2"/>
+<xs:selector xpath=".//vertable5" />
+<xs:field xpath="id2" />
+<xs:field xpath="idb1" />
+<xs:field xpath="idb2" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertable5Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="guest_vertable_vertablelookup5" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable5_guest_vertable_vertablelookup5" refer="guest:vertablelookup5_vertable5AKey">
-<xs:selector xpath=".//vertable5"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable5" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="guest_vertable_vertablelookupb5" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="guest_vertable5_guest_vertable_vertablelookupb5" refer="guest:vertablelookupb5_vertable5AKey">
-<xs:selector xpath=".//vertable5"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertable5" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="id1">
 <xs:simpleType>
 <xs:restriction base="fdo:int32">
-<xs:maxExclusive value="5"/>
+<xs:maxExclusive value="5" />
 </xs:restriction>
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="idb2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1381,40 +1381,40 @@
 </xs:complexType>
 <xs:element name="vertablelookup1" type="guest:vertablelookup1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookup1Key">
-<xs:selector xpath=".//vertablelookup1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookup1" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookup1_vertable1AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:unique name="vertablelookup1Key_0">
-<xs:selector xpath=".//vertablelookup1"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertablelookup1" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertablelookup1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1424,40 +1424,40 @@
 </xs:complexType>
 <xs:element name="vertablelookup2" type="guest:vertablelookup2Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookup2Key">
-<xs:selector xpath=".//vertablelookup2"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookup2" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookup2_vertable2AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:unique name="vertablelookup2Key_0">
-<xs:selector xpath=".//vertablelookup2"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertablelookup2" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertablelookup2Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1467,40 +1467,40 @@
 </xs:complexType>
 <xs:element name="vertablelookup3" type="guest:vertablelookup3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookup3Key">
-<xs:selector xpath=".//vertablelookup3"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookup3" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookup3_vertable3AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:unique name="vertablelookup3Key_0">
-<xs:selector xpath=".//vertablelookup3"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertablelookup3" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertablelookup3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1510,40 +1510,40 @@
 </xs:complexType>
 <xs:element name="vertablelookup4" type="guest:vertablelookup4Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookup4Key">
-<xs:selector xpath=".//vertablelookup4"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookup4" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookup4_vertable4AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:unique name="vertablelookup4Key_0">
-<xs:selector xpath=".//vertablelookup4"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertablelookup4" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertablelookup4Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1553,40 +1553,40 @@
 </xs:complexType>
 <xs:element name="vertablelookup5" type="guest:vertablelookup5Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookup5Key">
-<xs:selector xpath=".//vertablelookup5"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookup5" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookup5_vertable5AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:unique name="vertablelookup5Key_0">
-<xs:selector xpath=".//vertablelookup5"/>
-<xs:field xpath="name"/>
+<xs:selector xpath=".//vertablelookup5" />
+<xs:field xpath="name" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="vertablelookup5Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1596,46 +1596,46 @@
 </xs:complexType>
 <xs:element name="vertablelookupb1" type="guest:vertablelookupb1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookupb1Key">
-<xs:selector xpath=".//vertablelookupb1"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookupb1" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookupb1_vertable1AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="vertablelookupb1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1645,46 +1645,46 @@
 </xs:complexType>
 <xs:element name="vertablelookupb2" type="guest:vertablelookupb2Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookupb2Key">
-<xs:selector xpath=".//vertablelookupb2"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookupb2" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookupb2_vertable2AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="vertablelookupb2Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1694,46 +1694,46 @@
 </xs:complexType>
 <xs:element name="vertablelookupb3" type="guest:vertablelookupb3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookupb3Key">
-<xs:selector xpath=".//vertablelookupb3"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookupb3" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookupb3_vertable3AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="vertablelookupb3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1743,46 +1743,46 @@
 </xs:complexType>
 <xs:element name="vertablelookupb4" type="guest:vertablelookupb4Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookupb4Key">
-<xs:selector xpath=".//vertablelookupb4"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookupb4" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookupb4_vertable4AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="vertablelookupb4Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1792,46 +1792,46 @@
 </xs:complexType>
 <xs:element name="vertablelookupb5" type="guest:vertablelookupb5Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="vertablelookupb5Key">
-<xs:selector xpath=".//vertablelookupb5"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//vertablelookupb5" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 <xs:key name="vertablelookupb5_vertable5AKey">
-<xs:selector xpath=".//guest"/>
-<xs:field xpath="id1"/>
-<xs:field xpath="id2"/>
+<xs:selector xpath=".//guest" />
+<xs:field xpath="id1" />
+<xs:field xpath="id2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="vertablelookupb5Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="id1">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="id2">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="name">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -1842,228 +1842,228 @@
 </xs:schema>
 <SchemaMapping xmlns:rdb="http://fdordbms.osgeo.org/schemas" xmlns="http://www.autodesk.com/isd/fdo/SqlServerProvider" textInRow="NotInRow" provider="Autodesk.SqlServer.3.5" name="dbo">
 <complexType name="rtable1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable1" name="dbo.rtable1"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable1" name="dbo.rtable1" />
 </complexType>
 <complexType name="rtable2Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable2" name="dbo.rtable2"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable2" name="dbo.rtable2" />
 </complexType>
 <complexType name="rtable7Type" identityIsGloballyUnique="false" identitySeed="1" identityIncrement="1" identityPropertyName="TABLE7_ID12345678901234567890">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable7" name="dbo.rtable7"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable7" name="dbo.rtable7" />
 </complexType>
 <complexType name="table1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table1" name="dbo.table1"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table1" name="dbo.table1" />
 </complexType>
 <complexType name="table3Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table3" name="dbo.table3"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table3" name="dbo.table3" />
 </complexType>
 <complexType name="table4Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table4" name="dbo.table4"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table4" name="dbo.table4" />
 </complexType>
 <complexType name="table7Type" identityIsGloballyUnique="false" identitySeed="1" identityIncrement="1" identityPropertyName="ID">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table7" name="dbo.table7"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table7" name="dbo.table7" />
 </complexType>
 <complexType name="view1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_view1" name="dbo.view1"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_view1" name="dbo.view1" />
 </complexType>
 <complexType name="view3Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_view3" name="dbo.view3"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_view3" name="dbo.view3" />
 </complexType>
 </SchemaMapping>
 <SchemaMapping xmlns:rdb="http://fdordbms.osgeo.org/schemas" xmlns="http://www.autodesk.com/isd/fdo/SqlServerProvider" textInRow="NotInRow" provider="Autodesk.SqlServer.3.5" name="guest">
 <complexType name="vertable1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable1" name="guest.vertable1"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable1" name="guest.vertable1" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="idb1">
-<Column name="idb1"/>
+<Column name="idb1" />
 </element>
 <element name="idb2">
-<Column name="idb2"/>
+<Column name="idb2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertable2Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable2" name="guest.vertable2"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable2" name="guest.vertable2" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="idb1">
-<Column name="idb1"/>
+<Column name="idb1" />
 </element>
 <element name="idb2">
-<Column name="idb2"/>
+<Column name="idb2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertable3Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable3" name="guest.vertable3"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable3" name="guest.vertable3" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="idb1">
-<Column name="idb1"/>
+<Column name="idb1" />
 </element>
 <element name="idb2">
-<Column name="idb2"/>
+<Column name="idb2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertable4Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable4" name="guest.vertable4"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable4" name="guest.vertable4" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="idb1">
-<Column name="idb1"/>
+<Column name="idb1" />
 </element>
 <element name="idb2">
-<Column name="idb2"/>
+<Column name="idb2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertable5Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable5" name="guest.vertable5"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertable5" name="guest.vertable5" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="idb1">
-<Column name="idb1"/>
+<Column name="idb1" />
 </element>
 <element name="idb2">
-<Column name="idb2"/>
+<Column name="idb2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookup1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup1" name="guest.vertablelookup1"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup1" name="guest.vertablelookup1" />
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookup2Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup2" name="guest.vertablelookup2"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup2" name="guest.vertablelookup2" />
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookup3Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup3" name="guest.vertablelookup3"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup3" name="guest.vertablelookup3" />
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookup4Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup4" name="guest.vertablelookup4"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup4" name="guest.vertablelookup4" />
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookup5Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup5" name="guest.vertablelookup5"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookup5" name="guest.vertablelookup5" />
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookupb1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb1" name="guest.vertablelookupb1"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb1" name="guest.vertablelookupb1" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookupb2Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb2" name="guest.vertablelookupb2"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb2" name="guest.vertablelookupb2" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookupb3Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb3" name="guest.vertablelookupb3"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb3" name="guest.vertablelookupb3" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookupb4Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb4" name="guest.vertablelookupb4"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb4" name="guest.vertablelookupb4" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 <complexType name="vertablelookupb5Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb5" name="guest.vertablelookupb5"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_guest_vertablelookupb5" name="guest.vertablelookupb5" />
 <element name="id1">
-<Column name="id1"/>
+<Column name="id1" />
 </element>
 <element name="id2">
-<Column name="id2"/>
+<Column name="id2" />
 </element>
 <element name="name">
-<Column name="name"/>
+<Column name="name" />
 </element>
 </complexType>
 </SchemaMapping>
-</fdo:DataStore>
+</fdo:DataStore>
\ No newline at end of file

Modified: trunk/Tools/Maestro/TestData/gen_default1_SqlServer_master.xml
===================================================================
--- trunk/Tools/Maestro/TestData/gen_default1_SqlServer_master.xml	2014-11-29 13:22:17 UTC (rev 8458)
+++ trunk/Tools/Maestro/TestData/gen_default1_SqlServer_master.xml	2014-12-25 08:20:40 UTC (rev 8459)
@@ -2,66 +2,66 @@
 <fdo:DataStore xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gml="http://www.opengis.net/gml" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:fds="http://fdo.osgeo.org/schemas/fds">
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://fdo.osgeo.org/schemas/feature/dbo" xmlns:fdo="http://fdo.osgeo.org/schemas" xmlns:gml="http://www.opengis.net/gml" xmlns:dbo="http://fdo.osgeo.org/schemas/feature/dbo" elementFormDefault="qualified" attributeFormDefault="unqualified">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:element name="rtable1" type="dbo:rtable1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="rtable1Key">
-<xs:selector xpath=".//rtable1"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//rtable1" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="rtable1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="FK_RTABLE1_TABLE1" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="dbo_rtable1_FK_RTABLE1_TABLE1" refer="dbo:table1_rtable1AKey">
-<xs:selector xpath=".//rtable1"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//rtable1" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:keyref>
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE1_ID012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
@@ -70,115 +70,115 @@
 </xs:complexType>
 <xs:element name="rtable2" type="dbo:rtable2Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="rtable2Key">
-<xs:selector xpath=".//rtable2"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//rtable2" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="rtable2Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="FK_RTABLE2_TABLE1" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="TABLE1_ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="dbo_rtable2_FK_RTABLE2_TABLE1" refer="dbo:table1_rtable2AKey">
-<xs:selector xpath=".//rtable2"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//rtable2" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:keyref>
 </xs:element>
 <xs:element name="FK_RTABLE2_TABLE3" minOccurs="0" maxOccurs="1" fdo:multiplicity="" fdo:deleteRule="Break" fdo:defaultIdentity="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexType>
 <xs:sequence>
 <xs:element name="TABLE3_KEY1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE3_KEY2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 </xs:sequence>
 </xs:complexType>
 <xs:keyref name="dbo_rtable2_FK_RTABLE2_TABLE3" refer="dbo:table3_rtable2AKey">
-<xs:selector xpath=".//rtable2"/>
-<xs:field xpath="KEY1"/>
-<xs:field xpath="KEY2"/>
+<xs:selector xpath=".//rtable2" />
+<xs:field xpath="KEY1" />
+<xs:field xpath="KEY2" />
 </xs:keyref>
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE1_ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="TABLE3_KEY1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE3_KEY2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -188,45 +188,45 @@
 </xs:complexType>
 <xs:element name="rtable7" type="dbo:rtable7Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="rtable7Key">
-<xs:selector xpath=".//rtable7"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//rtable7" />
+<xs:field xpath="ID" />
 </xs:key>
 <xs:unique name="rtable7Key_0">
-<xs:selector xpath=".//rtable7"/>
-<xs:field xpath="TABLE7_ID12345678901234567890"/>
+<xs:selector xpath=".//rtable7" />
+<xs:field xpath="TABLE7_ID12345678901234567890" />
 </xs:unique>
 </xs:element>
 <xs:complexType name="rtable7Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TABLE7_ID12345678901234567890" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
@@ -235,315 +235,315 @@
 </xs:complexType>
 <xs:element name="table1" type="dbo:table1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table1Key">
-<xs:selector xpath=".//table1"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//table1" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:key>
 <xs:key name="table1_rtable1AKey">
-<xs:selector xpath=".//dbo"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//dbo" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:key>
 <xs:key name="table1_rtable2AKey">
-<xs:selector xpath=".//dbo"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//dbo" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:key>
 </xs:element>
 <xs:complexType name="table1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="BINARY_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BLOB_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BOOL_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="fdo:byte" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="fdo:byte" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="CHAR1_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="1"/>
+<xs:maxLength value="1" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="CHAR5_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="5"/>
+<xs:maxLength value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="DECIMAL_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="5"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="DOUBLE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INSERT_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="25"/>
+<xs:maxLength value="25" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="INT16_COLUMN345678901234567890" minOccurs="0">
 <xs:simpleType>
 <xs:restriction base="fdo:int16">
-<xs:maxExclusive value="20000"/>
+<xs:maxExclusive value="20000" />
 </xs:restriction>
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT32_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT64_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="LONG_STRING" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="8000"/>
+<xs:maxLength value="8000" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="MONEY_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="19"/>
-<xs:fractionDigits value="4"/>
+<xs:totalDigits value="19" />
+<xs:fractionDigits value="4" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NCHAR_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NEW_GEOM_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="NTEXT_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="1073741823"/>
+<xs:maxLength value="1073741823" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NUMERIC_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="5"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="NVARCHAR_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="OBJECT_NAME" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="128"/>
+<xs:maxLength value="128" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="REAL_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="SINGLE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="SMALLDATETIME_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:dateTime"/>
+<xs:restriction base="xs:dateTime" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="SMALLMONEY_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="4"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="4" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TEXT_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="2147483647"/>
+<xs:maxLength value="2147483647" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="TIMESTAMP_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:dateTime"/>
+<xs:restriction base="xs:dateTime" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="TINYINT_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="fdo:byte" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="UNIQUEID_COLUMN" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="36"/>
+<xs:maxLength value="36" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="VARBINARY_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
@@ -552,48 +552,48 @@
 </xs:complexType>
 <xs:element name="table3" type="dbo:table3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table3Key">
-<xs:selector xpath=".//table3"/>
-<xs:field xpath="KEY1"/>
-<xs:field xpath="KEY2"/>
+<xs:selector xpath=".//table3" />
+<xs:field xpath="KEY1" />
+<xs:field xpath="KEY2" />
 </xs:key>
 <xs:key name="table3_rtable2AKey">
-<xs:selector xpath=".//dbo"/>
-<xs:field xpath="KEY1"/>
-<xs:field xpath="KEY2"/>
+<xs:selector xpath=".//dbo" />
+<xs:field xpath="KEY1" />
+<xs:field xpath="KEY2" />
 </xs:key>
 </xs:element>
 <xs:complexType name="table3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="DOUBLE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:double"/>
+<xs:restriction base="xs:double" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="KEY1">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="KEY2">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="10"/>
+<xs:maxLength value="10" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -603,48 +603,48 @@
 </xs:complexType>
 <xs:element name="table4" type="dbo:table4Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table4Key">
-<xs:selector xpath=".//table4"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//table4" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="table4Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="GEOM_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="fdo:int16" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -654,32 +654,32 @@
 </xs:complexType>
 <xs:element name="table7" type="dbo:table7Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="table7Key">
-<xs:selector xpath=".//table7"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//table7" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="table7Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="ID" fdo:readOnly="true" fdo:autogenerated="true">
 <xs:simpleType>
-<xs:restriction base="fdo:int64"/>
+<xs:restriction base="fdo:int64" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -689,42 +689,42 @@
 </xs:complexType>
 <xs:element name="view1" type="dbo:view1Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="view1Key">
-<xs:selector xpath=".//view1"/>
-<xs:field xpath="ID3456789012345678901234567890"/>
+<xs:selector xpath=".//view1" />
+<xs:field xpath="ID3456789012345678901234567890" />
 </xs:key>
 </xs:element>
 <xs:complexType name="view1Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="BYTE_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:byte"/>
+<xs:restriction base="fdo:byte" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="DEC_COL_RENAME" minOccurs="0">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:decimal">
-<xs:totalDigits value="10"/>
-<xs:fractionDigits value="5"/>
+<xs:totalDigits value="10" />
+<xs:fractionDigits value="5" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
 <xs:element name="ID3456789012345678901234567890">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 </xs:sequence>
@@ -733,48 +733,48 @@
 </xs:complexType>
 <xs:element name="view3" type="dbo:view3Type" abstract="false" substitutionGroup="gml:_Feature">
 <xs:key name="view3Key">
-<xs:selector xpath=".//view3"/>
-<xs:field xpath="ID"/>
+<xs:selector xpath=".//view3" />
+<xs:field xpath="ID" />
 </xs:key>
 </xs:element>
 <xs:complexType name="view3Type" abstract="false">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:complexContent>
 <xs:extension base="fdo:ClassType">
 <xs:sequence>
 <xs:element name="GEOM_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="xs:hexBinary"/>
+<xs:restriction base="xs:hexBinary" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="ID">
 <xs:simpleType>
-<xs:restriction base="fdo:int32"/>
+<xs:restriction base="fdo:int32" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="INT16_COLUMN" minOccurs="0">
 <xs:simpleType>
-<xs:restriction base="fdo:int16"/>
+<xs:restriction base="fdo:int16" />
 </xs:simpleType>
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 </xs:element>
 <xs:element name="STRING_COLUMN">
 <xs:annotation>
-<xs:documentation/>
+<xs:documentation />
 </xs:annotation>
 <xs:simpleType>
 <xs:restriction base="xs:string">
-<xs:maxLength value="50"/>
+<xs:maxLength value="50" />
 </xs:restriction>
 </xs:simpleType>
 </xs:element>
@@ -785,31 +785,31 @@
 </xs:schema>
 <SchemaMapping xmlns:rdb="http://fdordbms.osgeo.org/schemas" xmlns="http://www.autodesk.com/isd/fdo/SqlServerProvider" textInRow="NotInRow" provider="Autodesk.SqlServer.3.5" name="dbo">
 <complexType name="rtable1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable1" name="dbo.rtable1"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable1" name="dbo.rtable1" />
 </complexType>
 <complexType name="rtable2Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable2" name="dbo.rtable2"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable2" name="dbo.rtable2" />
 </complexType>
 <complexType name="rtable7Type" identityIsGloballyUnique="false" identitySeed="1" identityIncrement="1" identityPropertyName="TABLE7_ID12345678901234567890">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable7" name="dbo.rtable7"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_rtable7" name="dbo.rtable7" />
 </complexType>
 <complexType name="table1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table1" name="dbo.table1"/>
+<Table tableFilegroup="PRIMARY" textFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table1" name="dbo.table1" />
 </complexType>
 <complexType name="table3Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table3" name="dbo.table3"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table3" name="dbo.table3" />
 </complexType>
 <complexType name="table4Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table4" name="dbo.table4"/>
+<Table tableFilegroup="PRIMARY" textFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table4" name="dbo.table4" />
 </complexType>
 <complexType name="table7Type" identityIsGloballyUnique="false" identitySeed="1" identityIncrement="1" identityPropertyName="ID">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table7" name="dbo.table7"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_table7" name="dbo.table7" />
 </complexType>
 <complexType name="view1Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_view1" name="dbo.view1"/>
+<Table tableFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_view1" name="dbo.view1" />
 </complexType>
 <complexType name="view3Type" identityIsGloballyUnique="false" identitySeed="0" identityIncrement="0" identityPropertyName="">
-<Table tableFilegroup="PRIMARY" textFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_view3" name="dbo.view3"/>
+<Table tableFilegroup="PRIMARY" textFilegroup="PRIMARY" textInRow="NotInRow" pkeyName="pk_dbo_view3" name="dbo.view3" />
 </complexType>
 </SchemaMapping>
-</fdo:DataStore>
+</fdo:DataStore>
\ No newline at end of file

• Next message (by thread): [mapguide-commits] r8460 - in trunk/MgDev/UnitTest/TestData: DrawingService MappingService PrintLayout ResourceService Symbology TileService Wfs Wms
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]