[mapguide-commits] r8752 - in trunk/Tools/Maestro: Generated LocalConfigure/Properties Maestro Maestro/Properties Maestro.AddIn.ExtendedObjectModels Maestro.AddIn.ExtendedObjectModels/Properties Maestro.AddIn.ExtendedObjectModels/Templates Maestro.AddIn.FdoToolbox/Properties Maestro.AddIn.Local Maestro.AddIn.Local/Properties Maestro.AddIn.Local/Services Maestro.AddIn.Rest Maestro.AddIn.Rest/Model Maestro.AddIn.Rest/Properties Maestro.AddIn.Rest/UI Maestro.AddIn.Rest/UI/Methods Maestro.AddIn.Scripting Maestro.AddIn.Scripting/Lang/Python Maestro.AddIn.Scripting/Properties Maestro.AddIn.Scripting/UI Maestro.AddInManager Maestro.Base Maestro.Base/Commands Maestro.Base/Commands/SiteExplorer Maestro.Base/Commands/Test Maestro.Base/Editor Maestro.Base/Properties Maestro.Base/Services Maestro.Base/Services/DragDropHandlers Maestro.Base/Templates Maestro.Base/UI Maestro.Base/UI/Packaging Maestro.Editors Maestro.Editors/Common Maestro.Editors/Common/Expression Maestro.Editors/Diff Maestro.Editors/Featur eSource Maestro.Editors/FeatureSource/Extensions Maestro.Editors/FeatureSource/Providers/Gdal Maestro.Editors/FeatureSource/Providers/Odbc Maestro.Editors/FeatureSource/Providers/Rdbms Maestro.Editors/FeatureSource/Providers/Wms Maestro.Editors/Fusion Maestro.Editors/Generic Maestro.Editors/Generic/XmlEditor/AutoCompletion Maestro.Editors/LayerDefinition/Vector/Scales Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceEditors Maestro.Editors/LayerDefinition/Vector/StyleEditors Maestro.Editors/MapDefinition Maestro.Editors/Packaging Maestro.Editors/Preview Maestro.Editors/Properties Maestro.Editors/SymbolDefinition Maestro.Editors/TileSetDefinition Maestro.Editors/TileSetDefinition/Providers Maestro.Editors/WatermarkDefinition Maestro.LiveMapEditor Maestro.LiveMapEditor/Properties Maestro.Login Maestro.MapViewer/Properties Maestro.Packaging Maestro.Packaging/Properties Maestro.Shared.UI Maestro.Shared.UI/Properties MaestroFsPreview MaestroFsPreview/Properties MgCooker MgCook er/Properties OSGeo.FDO.Expressions OSGeo.FDO.Expressions/Properties OSGeo.MapGuide.MaestroAPI OSGeo.MapGuide.MaestroAPI/Commands OSGeo.MapGuide.MaestroAPI/CrossConnection OSGeo.MapGuide.MaestroAPI/Internal OSGeo.MapGuide.MaestroAPI/Properties OSGeo.MapGuide.MaestroAPI/Resource/Validation OSGeo.MapGuide.MaestroAPI/SchemaOverrides OSGeo.MapGuide.MaestroAPI/Services OSGeo.MapGuide.MaestroAPI.Http OSGeo.MapGuide.MaestroAPI.Http/Commands OSGeo.MapGuide.MaestroAPI.Local OSGeo.MapGuide.MaestroAPI.Native OSGeo.MapGuide.MaestroAPI.Native/Commands OSGeo.MapGuide.ObjectModels OSGeo.MapGuide.ObjectModels/ApplicationDefinition OSGeo.MapGuide.ObjectModels/ApplicationDefinition/v1_0_0 OSGeo.MapGuide.ObjectModels/Capabilities OSGeo.MapGuide.ObjectModels/Capabilities/v1_0_0 OSGeo.MapGuide.ObjectModels/Capabilities/v1_1_0 OSGeo.MapGuide.ObjectModels/Common OSGeo.MapGuide.ObjectModels/DrawingSource OSGeo.MapGuide.ObjectModels/DrawingSource/v1_0_0 OSGeo.MapGuide.ObjectModels/FeatureSource OSGeo.MapGui de.ObjectModels/FeatureSource/v1_0_0 OSGeo.MapGuide.ObjectModels/IO OSGeo.MapGuide.ObjectModels/LayerDefinition OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0 OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0 OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0 OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0 OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0 OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0 OSGeo.MapGuide.ObjectModels/LoadProcedure OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_0_0 OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0 OSGeo.MapGuide.ObjectModels/LoadProcedure/v2_4_0 OSGeo.MapGuide.ObjectModels/MapDefinition OSGeo.MapGuide.ObjectModels/MapDefinition/v1_0_0 OSGeo.MapGuide.ObjectModels/MapDefinition/v2_3_0 OSGeo.MapGuide.ObjectModels/MapDefinition/v2_4_0 OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0 OSGeo.MapGuide.ObjectModels/PrintLayout OSGeo.MapGuide.ObjectModels/PrintLayout/v1.0.0 OSGeo.MapGuide.ObjectModels/Properties OSGeo.MapGuide.ObjectModel s/RuntimeMap OSGeo.MapGuide.ObjectModels/RuntimeMap/v2_6_0 OSGeo.MapGuide.ObjectModels/RuntimeMap/v3_0_0 OSGeo.MapGuide.ObjectModels/SymbolDefinition OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_0_0 OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_1_0 OSGeo.MapGuide.ObjectModels/SymbolDefinition/v2_4_0 OSGeo.MapGuide.ObjectModels/SymbolLibrary OSGeo.MapGuide.ObjectModels/SymbolLibrary/v1.0.0 OSGeo.MapGuide.ObjectModels/TileSetDefinition OSGeo.MapGuide.ObjectModels/TileSetDefinition/v3_0_0 OSGeo.MapGuide.ObjectModels/WatermarkDefinition OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_3_0 OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_4_0 OSGeo.MapGuide.ObjectModels/WebLayout OSGeo.MapGuide.ObjectModels/WebLayout/v1_0_0 OSGeo.MapGuide.ObjectModels/WebLayout/v1_1_0 OSGeo.MapGuide.ObjectModels/WebLayout/v2_4_0 OSGeo.MapGuide.ObjectModels/WebLayout/v2_6_0 ProviderTemplate/Properties RtMapInspector RtMapInspector/Properties

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Tue Aug 18 10:39:17 PDT 2015


Author: jng
Date: 2015-08-18 10:39:17 -0700 (Tue, 18 Aug 2015)
New Revision: 8752

Modified:
   trunk/Tools/Maestro/Generated/ApplicationDefinition-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/ApplicationDefinitionInfo-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/DataStoreList-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/DrawingSectionList-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/DrawingSectionResourceList-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/DrawingSource-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/Envelope-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/FdoLongTransactionList-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/FdoProviderCapabilities-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/FdoProviderCapabilities-1.1.0.designer.cs
   trunk/Tools/Maestro/Generated/FdoSpatialContextList-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/FeatureProviderRegistry-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/FeatureSource-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/GroupList-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/LayerDefinition-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/LayerDefinition-1.1.0.designer.cs
   trunk/Tools/Maestro/Generated/LayerDefinition-1.2.0.designer.cs
   trunk/Tools/Maestro/Generated/LayerDefinition-1.3.0.designer.cs
   trunk/Tools/Maestro/Generated/LayerDefinition-2.3.0.designer.cs
   trunk/Tools/Maestro/Generated/LayerDefinition-2.4.0.designer.cs
   trunk/Tools/Maestro/Generated/LoadProcedure-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/LoadProcedure-1.1.0.designer.cs
   trunk/Tools/Maestro/Generated/LoadProcedure-2.2.0.designer.cs
   trunk/Tools/Maestro/Generated/MapDefinition-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/MapDefinition-2.3.0.designer.cs
   trunk/Tools/Maestro/Generated/MapDefinition-2.4.0.designer.cs
   trunk/Tools/Maestro/Generated/MapDefinition-3.0.0.designer.cs
   trunk/Tools/Maestro/Generated/PrintLayout-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/RepositoryList-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/ResourceDataList-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/ResourceList-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/ResourcePackageManifest-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/ResourceReferenceList-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/RuntimeMap-2.6.0.designer.cs
   trunk/Tools/Maestro/Generated/RuntimeMap-3.0.0.designer.cs
   trunk/Tools/Maestro/Generated/SiteInformation-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/SiteVersion-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/StringCollection-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/SymbolDefinition-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/SymbolDefinition-1.1.0.designer.cs
   trunk/Tools/Maestro/Generated/SymbolDefinition-2.4.0.designer.cs
   trunk/Tools/Maestro/Generated/SymbolLibrary-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/TileSetDefinition-3.0.0.designer.cs
   trunk/Tools/Maestro/Generated/UnmanagedDataList-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/UserList-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/WatermarkDefinition-2.3.0.designer.cs
   trunk/Tools/Maestro/Generated/WatermarkDefinition-2.4.0.designer.cs
   trunk/Tools/Maestro/Generated/WebLayout-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/WebLayout-1.1.0.designer.cs
   trunk/Tools/Maestro/Generated/WebLayout-2.4.0.designer.cs
   trunk/Tools/Maestro/Generated/WebLayout-2.6.0.designer.cs
   trunk/Tools/Maestro/LocalConfigure/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Strings.Designer.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/MapDefinition300ItemTemplate.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/TileSetDefinition300ItemTemplate.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.FdoToolbox/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/Maestro.AddIn.Local/Services/LocalPreviewer.cs
   trunk/Tools/Maestro/Maestro.AddIn.Local/Strings.Designer.cs
   trunk/Tools/Maestro/Maestro.AddIn.Rest/Model/DataConfigurationList.cs
   trunk/Tools/Maestro/Maestro.AddIn.Rest/Model/DataFileList.cs
   trunk/Tools/Maestro/Maestro.AddIn.Rest/Model/RestSourceContext.cs
   trunk/Tools/Maestro/Maestro.AddIn.Rest/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/Maestro.AddIn.Rest/Strings.Designer.cs
   trunk/Tools/Maestro/Maestro.AddIn.Rest/UI/Methods/GetMethodCtrl.cs
   trunk/Tools/Maestro/Maestro.AddIn.Rest/UI/RestExplorer.cs
   trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/PythonOutputStream.cs
   trunk/Tools/Maestro/Maestro.AddIn.Scripting/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/Maestro.AddIn.Scripting/Strings.Designer.cs
   trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronPythonRepl.cs
   trunk/Tools/Maestro/Maestro.AddInManager/Strings.Designer.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/PasteCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SaveResourceAsCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DeleteSelectedItemsCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DuplicateResourceCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/GetLayerSpatialContextCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/PurgeFeatureSourceCacheCommand.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/ShowSpatialContextsCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/TestResourceCompatibilityCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenSymbolBrowserCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/Test/TestCommands.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/FeatureSourceEditor.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/MapDefinitionEditor.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/TileSetEditor.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/WatermarkDefinitionEditor.cs
   trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/Maestro.Base/Services/ClipboardService.cs
   trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/DwfFileHandler.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/OpenResourceManager.cs
   trunk/Tools/Maestro/Maestro.Base/Strings.Designer.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.Designer.cs
   trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/ISiteExplorer.cs
   trunk/Tools/Maestro/Maestro.Base/UI/OpenResourceIdDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/Packaging/CreatePackageDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/ProfilingDialog.cs
   trunk/Tools/Maestro/Maestro.Base/UI/RepositoryTreeModel.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/WorkbenchInitializer.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/EditorWindow.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/Expression/ExpressionDisplayDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/Expression/ExpressionParseErrorDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/Expression/FdoExpressionValidator.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/Expression/MalformedExpressionDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/ExpressionEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/MonoCompatibleExpressionEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/RepointerDialog.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/SymbolPicker.cs
   trunk/Tools/Maestro/Maestro.Editors/Diff/CompareResourceDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Diff/XmlCompareUtil.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/ExtendedClassSettings.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcProviderCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/SpatialContextsDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/FusionWidgetEditorMap.cs
   trunk/Tools/Maestro/Maestro.Editors/Fusion/MapSettingsCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlElementPath.cs
   trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/IEditorService.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ExplodeThemeDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceEditors/ReferenceCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ExtentCalculationDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/FiniteScaleListCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.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/MapLayersSectionCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ScaleListGenerator.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/LocalMapPreviewer.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/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/RepositoryHandle.cs
   trunk/Tools/Maestro/Maestro.Editors/ResourceEditorServiceBase.cs
   trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/Providers/GenericProviderCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/TileSetDefinitionEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/TileSetSettingsCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.cs
   trunk/Tools/Maestro/Maestro.LiveMapEditor/AboutDialog.cs
   trunk/Tools/Maestro/Maestro.LiveMapEditor/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/Maestro.LiveMapEditor/Strings.Designer.cs
   trunk/Tools/Maestro/Maestro.Login/Strings.Designer.cs
   trunk/Tools/Maestro/Maestro.MapViewer/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/Maestro.Packaging/PackageBuilder.cs
   trunk/Tools/Maestro/Maestro.Packaging/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/Maestro.Packaging/Strings.Designer.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/Maestro.Shared.UI/Strings.Designer.cs
   trunk/Tools/Maestro/Maestro/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/Maestro/Strings.Designer.cs
   trunk/Tools/Maestro/MaestroFsPreview/MainForm.cs
   trunk/Tools/Maestro/MaestroFsPreview/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/MgCooker/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/MgCooker/Strings.Designer.cs
   trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoBinaryExpression.cs
   trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoBinaryLogicalOperator.cs
   trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoComparisonCondition.cs
   trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoDistanceCondition.cs
   trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoExpressionGrammar.cs
   trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoFilterGrammar.cs
   trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoFunction.cs
   trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoGeometricCondition.cs
   trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoGeometryValue.cs
   trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoInCondition.cs
   trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoLiteralValue.cs
   trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoLogicalOperator.cs
   trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoParseable.cs
   trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoSearchCondition.cs
   trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoTerminalNames.cs
   trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoUnaryLogicalOperator.cs
   trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoValueExpression.cs
   trunk/Tools/Maestro/OSGeo.FDO.Expressions/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/OSGeo.FDO.Expressions/Strings.Designer.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Commands/HttpGetResourceContents.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Files.Designer.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpResourcePreviewUrlGenerator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Strings.Designer.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Commands/LocalGetResourceContents.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeConnection.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/ExecuteLoadProcedure.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/IGetResourceContents.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/IGetTileProviders.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CredentialWriter.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceMigrator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceRebaser.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ExtensionMethods.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Internal/FixedWKTReader.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseWebLayoutValidator.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ResourceValidationContext.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ValidationResultSet.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/GdalRasterItem.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/RasterWmsItem.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/WmsLayerDefinition.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IResourceService.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Strings.Designer.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/ApplicationDefinitionInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/v1_0_0/ApplicationDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/v1_0_0/ApplicationDefinitionInfoImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/BaseSerializable.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Capabilities/FdoCapabilities.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Capabilities/v1_0_0/FdoCapabilitiesImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Capabilities/v1_1_0/FdoCapabilitiesImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Check.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ExpressionDataType.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ExtendedDataType.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/Geometries.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IEnvelope.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IExpressionPropertySource.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IFdoSerializable.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IFdoSpatialContext.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ILongTransaction.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IRepositoryItem.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IResourceIdReference.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ResourceItems.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ResourceList.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ResourcePackageManifest.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/TileProviderList.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/UnmanagedDataList.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/DrawingSource/DrawingSourceInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/DrawingSource/v1_0_0/DrawingSourceImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/FeatureSourceInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/v1_0_0/FeatureSourceImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/IO/ReadOnlyRewindableStream.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/IO/Utf8XmlWriter.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/IResource.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/IVersionedEntity.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/LayerDefinitionInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0/GridLayerDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0/LayerElementFactoryImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0/VectorLayerDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0/GridLayerDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0/LayerElementFactoryImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0/VectorLayerDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0/GridLayerDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0/LayerElementFactoryImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0/VectorLayerDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0/GridLayerDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0/LayerElementFactoryImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0/VectorLayerDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0/GridLayerDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0/LayerElementFactoryImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0/VectorLayerDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0/GridLayerDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0/LayerElementFactoryImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0/VectorLayerDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/LoadProcedureInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_0_0/LoadProcedureFactoryImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_0_0/LoadProcedureImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0/LoadProcedureFactoryImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0/LoadProcedureImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v2_4_0/LoadProcedureFactoryImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v2_4_0/LoadProcedureImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/MapDefinitionInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v1_0_0/MapDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_3_0/MapDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_4_0/MapDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0/MapDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ObjectFactory.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/PrintLayout/PrintLayoutInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/PrintLayout/v1.0.0/PrintLayoutImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceContentVersionChecker.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceIdentifier.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypeDescriptor.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypeRegistry.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypes.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/RuntimeMap/RuntimeMapInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/RuntimeMap/v2_6_0/RuntimeMapImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/RuntimeMap/v3_0_0/RuntimeMapImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Strings.Designer.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/SymbolDefinitionInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_0_0/SymbolDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_1_0/SymbolDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v2_4_0/SymbolDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolLibrary/SymbolLibraryInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolLibrary/v1.0.0/SymbolLibraryImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/TileSetDefinition/TileSetInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/TileSetDefinition/v3_0_0/TileSetImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/UntypedResource.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Utility.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/WatermarkCollectionUtil.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/WatermarkDefinitionInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_3_0/WatermarkDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_4_0/WatermarkDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/WebLayoutInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_0_0/WebLayoutImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_1_0/WebLayoutImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_4_0/WebLayoutImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_6_0/WebLayoutImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/XmlNamespaces.cs
   trunk/Tools/Maestro/ProviderTemplate/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/RtMapInspector/MainForm.cs
   trunk/Tools/Maestro/RtMapInspector/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/RtMapInspector/Strings.Designer.cs
Log:
#2565: Using namespace cleanup

Modified: trunk/Tools/Maestro/Generated/ApplicationDefinition-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/ApplicationDefinition-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/ApplicationDefinition-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.ApplicationDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitia
 lizeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.ApplicationDefinition.v1_0_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.ApplicationDefinition.v1_0_0
+{
+    using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
     using System.ComponentModel;
     using System.IO;
-    using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
-    
+
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]

Modified: trunk/Tools/Maestro/Generated/ApplicationDefinitionInfo-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/ApplicationDefinitionInfo-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/ApplicationDefinitionInfo-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,11 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.ApplicationDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitia
 lizeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.ApplicationDefinition.v1_0_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.ApplicationDefinition.v1_0_0
+{
     using System.ComponentModel;
     using System.IO;
-    using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
-    
+
     /// <summary>
     /// Application definition widget info set
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/DataStoreList-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/DataStoreList-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/DataStoreList-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>Fals
 e</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.Common {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.Common
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     /// <summary>
     /// The list of datastores from a EnumerateDataStores request
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/DrawingSectionList-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/DrawingSectionList-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/DrawingSectionList-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>Fals
 e</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.Common {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.Common
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     /// <summary>
     /// Drawing Section list
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/DrawingSectionResourceList-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/DrawingSectionResourceList-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/DrawingSectionResourceList-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>Fals
 e</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.Common {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.Common
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     /// <summary>
     /// Drawing Section Resource list
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/DrawingSource-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/DrawingSource-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/DrawingSource-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -7,16 +7,10 @@
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.DrawingSource.v1_0_0
 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
     using System.ComponentModel;
     using System.IO;
-    using OSGeo.MapGuide.ObjectModels.DrawingSource;
-    
-    
+
+
     /// <summary>
     /// A drawing source is a definition that provides part of the information required to connect to a particular drawing
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/Envelope-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/Envelope-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/Envelope-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>Fals
 e</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.Common {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.Common
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     /// <summary>
     /// Specifies an envelope (a rectangle) using two corner points.
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/FdoLongTransactionList-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/FdoLongTransactionList-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/FdoLongTransactionList-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>Fals
 e</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.Common {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.Common
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]

Modified: trunk/Tools/Maestro/Generated/FdoProviderCapabilities-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/FdoProviderCapabilities-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/FdoProviderCapabilities-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.Capabilities</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeField
 s>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.Capabilities.v1_0_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.Capabilities.v1_0_0
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]

Modified: trunk/Tools/Maestro/Generated/FdoProviderCapabilities-1.1.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/FdoProviderCapabilities-1.1.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/FdoProviderCapabilities-1.1.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -4,16 +4,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.Capabilities</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeField
 s>True</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.Capabilities.v1_1_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.Capabilities.v1_1_0
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.20460")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]

Modified: trunk/Tools/Maestro/Generated/FdoSpatialContextList-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/FdoSpatialContextList-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/FdoSpatialContextList-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>Fals
 e</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.Common {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.Common
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]

Modified: trunk/Tools/Maestro/Generated/FeatureProviderRegistry-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/FeatureProviderRegistry-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/FeatureProviderRegistry-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>Fals
 e</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.Common {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.Common
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     /// <summary>
     /// Root element that contains a collection of FeatureProvider elements.
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/FeatureSource-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/FeatureSource-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/FeatureSource-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -7,16 +7,11 @@
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.FeatureSource.v1_0_0
 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+    using OSGeo.MapGuide.ObjectModels.Common;
+    using OSGeo.MapGuide.ObjectModels.FeatureSource;
     using System.ComponentModel;
     using System.IO;
-    using OSGeo.MapGuide.ObjectModels.FeatureSource;
-    using OSGeo.MapGuide.ObjectModels.Common;
-    
+
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]

Modified: trunk/Tools/Maestro/Generated/GroupList-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/GroupList-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/GroupList-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>Fals
 e</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.Common {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.Common
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     /// <summary>
     /// Group list
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/LayerDefinition-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/LayerDefinition-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/LayerDefinition-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,18 +5,14 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.LayerDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFi
 elds>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_0_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_0_0
+{
+    using OSGeo.MapGuide.ObjectModels.Common;
+    using OSGeo.MapGuide.ObjectModels.LayerDefinition;
     using System.ComponentModel;
     using System.IO;
-    using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-    using OSGeo.MapGuide.ObjectModels.Common;
-    
-    
+
+
     /// <summary>
     /// The specification of the data source and stylization for a layer.
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/LayerDefinition-1.1.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/LayerDefinition-1.1.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/LayerDefinition-1.1.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -7,17 +7,12 @@
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_1_0
 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
-    using System.ComponentModel;
-    using System.IO;
-    using OSGeo.MapGuide.ObjectModels.LayerDefinition;
     using OSGeo.MapGuide.ObjectModels.Common;
+    using OSGeo.MapGuide.ObjectModels.LayerDefinition;
     using OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_0_0;
-   
+    using System.ComponentModel;
+    using System.IO;
+
     /// <summary>
     /// The specification of the data source and stylization for a layer.
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/LayerDefinition-1.2.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/LayerDefinition-1.2.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/LayerDefinition-1.2.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -7,16 +7,11 @@
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_2_0
 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
-    using System.ComponentModel;
-    using System.IO;
-    using OSGeo.MapGuide.ObjectModels.LayerDefinition;
     using OSGeo.MapGuide.ObjectModels.Common;
+    using OSGeo.MapGuide.ObjectModels.LayerDefinition;
     using OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0;
+    using System.ComponentModel;
+    using System.IO;
 
     /// <summary>
     /// The specification of the data source and stylization for a layer.

Modified: trunk/Tools/Maestro/Generated/LayerDefinition-1.3.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/LayerDefinition-1.3.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/LayerDefinition-1.3.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,17 +5,13 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.LayerDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFi
 elds>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_3_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
-    using System.ComponentModel;
-    using System.IO;
-    using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_3_0
+{
     using OSGeo.MapGuide.ObjectModels.Common;
+    using OSGeo.MapGuide.ObjectModels.LayerDefinition;
     using OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0;
+    using System.ComponentModel;
+    using System.IO;
 
     /// <summary>
     /// The specification of the data source and stylization for a layer.

Modified: trunk/Tools/Maestro/Generated/LayerDefinition-2.3.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/LayerDefinition-2.3.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/LayerDefinition-2.3.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,19 +5,15 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.LayerDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFi
 elds>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v2_3_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
-    using System.ComponentModel;
-    using System.IO;
-    using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v2_3_0
+{
     using OSGeo.MapGuide.ObjectModels.Common;
+    using OSGeo.MapGuide.ObjectModels.LayerDefinition;
     using OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0;
     using OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_3_0;
-    
+    using System.ComponentModel;
+    using System.IO;
+
     /// <summary>
     /// The specification of the data source and stylization for a layer.
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/LayerDefinition-2.4.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/LayerDefinition-2.4.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/LayerDefinition-2.4.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,19 +5,15 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.LayerDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFi
 elds>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v2_4_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
-    using System.ComponentModel;
-    using System.IO;
-    using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v2_4_0
+{
     using OSGeo.MapGuide.ObjectModels.Common;
+    using OSGeo.MapGuide.ObjectModels.LayerDefinition;
     using OSGeo.MapGuide.ObjectModels.SymbolDefinition.v2_4_0;
     using OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_4_0;
-    
+    using System.ComponentModel;
+    using System.IO;
+
     /// <summary>
     /// The specification of the data source and stylization for a layer.
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/LoadProcedure-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/LoadProcedure-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/LoadProcedure-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.LoadProcedure</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFiel
 ds>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_0_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_0_0
+{
+    using OSGeo.MapGuide.ObjectModels.LoadProcedure;
     using System.ComponentModel;
     using System.IO;
-    using OSGeo.MapGuide.ObjectModels.LoadProcedure;
-    
+
     /// <summary>
     /// Specification of a load procedure
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/LoadProcedure-1.1.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/LoadProcedure-1.1.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/LoadProcedure-1.1.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.LoadProcedure</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFiel
 ds>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_1_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.LoadProcedure.v1_1_0
+{
+    using OSGeo.MapGuide.ObjectModels.LoadProcedure;
     using System.ComponentModel;
     using System.IO;
-    using OSGeo.MapGuide.ObjectModels.LoadProcedure;
-    
+
     /// <summary>
     /// Specification of a load procedure
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/LoadProcedure-2.2.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/LoadProcedure-2.2.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/LoadProcedure-2.2.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.LoadProcedure</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFiel
 ds>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.LoadProcedure.v2_2_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.LoadProcedure.v2_2_0
+{
+    using OSGeo.MapGuide.ObjectModels.LoadProcedure;
     using System.ComponentModel;
     using System.IO;
-    using OSGeo.MapGuide.ObjectModels.LoadProcedure;
-    
+
     /// <summary>
     /// Specification of a load procedure
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/MapDefinition-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/MapDefinition-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/MapDefinition-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -7,16 +7,10 @@
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.MapDefinition.v1_0_0
 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
     using System.ComponentModel;
-    using System.IO;
     using System.Drawing;
-    using OSGeo.MapGuide.ObjectModels.MapDefinition;
-    
+    using System.IO;
+
     /// <summary>
     /// A MapDefinition defines the collection of layers, groupings of layers, and base map
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/MapDefinition-2.3.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/MapDefinition-2.3.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/MapDefinition-2.3.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -7,17 +7,11 @@
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.MapDefinition.v2_3_0
 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+    using OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_3_0;
     using System.ComponentModel;
-    using System.IO;
     using System.Drawing;
-    using OSGeo.MapGuide.ObjectModels.MapDefinition;
-    using OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_3_0;
-    
+    using System.IO;
+
     /// <summary>
     /// A MapDefinition defines the collection of layers, groupings of layers, and base map
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/MapDefinition-2.4.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/MapDefinition-2.4.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/MapDefinition-2.4.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -7,17 +7,11 @@
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.MapDefinition.v2_4_0
 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+    using OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_4_0;
     using System.ComponentModel;
-    using System.IO;
     using System.Drawing;
-    using OSGeo.MapGuide.ObjectModels.MapDefinition;
-    using OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_4_0;
-    
+    using System.IO;
+
     /// <summary>
     /// A MapDefinition defines the collection of layers, groupings of layers, and base map
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/MapDefinition-3.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/MapDefinition-3.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/MapDefinition-3.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -7,16 +7,10 @@
 // ------------------------------------------------------------------------------
 namespace OSGeo.MapGuide.ObjectModels.MapDefinition.v3_0_0
 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+    using OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_4_0;
     using System.ComponentModel;
-    using System.IO;
     using System.Drawing;
-    using OSGeo.MapGuide.ObjectModels.MapDefinition;
-    using OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_4_0;
+    using System.IO;
 
     /// <summary>
     /// A MapDefinition defines the collection of layers, groupings of layers, and base map

Modified: trunk/Tools/Maestro/Generated/PrintLayout-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/PrintLayout-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/PrintLayout-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,11 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.PrintLayout</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields
 >False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.PrintLayout.v1_0_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.PrintLayout.v1_0_0
+{
     using System.ComponentModel;
     using System.IO;
-    using OSGeo.MapGuide.ObjectModels.PrintLayout;
-    
+
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]

Modified: trunk/Tools/Maestro/Generated/RepositoryList-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/RepositoryList-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/RepositoryList-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>Fals
 e</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.Common {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.Common
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]

Modified: trunk/Tools/Maestro/Generated/ResourceDataList-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/ResourceDataList-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/ResourceDataList-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>Fals
 e</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.Common {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.Common
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     /// <summary>
     /// Resource Data list
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/ResourceList-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/ResourceList-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/ResourceList-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>Fals
 e</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.Common {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.Common
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]

Modified: trunk/Tools/Maestro/Generated/ResourcePackageManifest-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/ResourcePackageManifest-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/ResourcePackageManifest-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>Fals
 e</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.Common {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.Common
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     /// <summary>
     /// Resource Package manifest
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/ResourceReferenceList-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/ResourceReferenceList-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/ResourceReferenceList-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>True</ExcludeIncludedTypes><EnableInitializeFields>False
 </EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.Common {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.Common
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     /// <summary>
     /// Resource Reference list
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/RuntimeMap-2.6.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/RuntimeMap-2.6.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/RuntimeMap-2.6.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.RuntimeMap</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>
 False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.RuntimeMap.v2_6_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.RuntimeMap.v2_6_0
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     /// <summary>
     /// Describes information about a Runtime Map, so that client applications can interact with it
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/RuntimeMap-3.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/RuntimeMap-3.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/RuntimeMap-3.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.RuntimeMap</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>
 False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.RuntimeMap.v3_0_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.RuntimeMap.v3_0_0
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     /// <summary>
     /// Describes information about a Runtime Map, so that client applications can interact with it
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/SiteInformation-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/SiteInformation-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/SiteInformation-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>Fals
 e</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.Common {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.Common
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     /// <summary>
     /// Site Information
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/SiteVersion-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/SiteVersion-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/SiteVersion-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>Fals
 e</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.Common {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.Common
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     /// <summary>
     /// Site Version
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/StringCollection-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/StringCollection-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/StringCollection-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>Fals
 e</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.Common {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.Common
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     /// <summary>
     /// String list
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/SymbolDefinition-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/SymbolDefinition-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/SymbolDefinition-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,17 +5,13 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.SymbolDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeF
 ields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_0_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_0_0
+{
+    using OSGeo.MapGuide.ObjectModels.Common;
+    using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
     using System.ComponentModel;
     using System.IO;
-    using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-    using OSGeo.MapGuide.ObjectModels.Common;
-    
+
     /// <summary>
     /// A 2D simple symbol for stylization.
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/SymbolDefinition-1.1.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/SymbolDefinition-1.1.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/SymbolDefinition-1.1.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,17 +5,13 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.SymbolDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeF
 ields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0
+{
+    using OSGeo.MapGuide.ObjectModels.Common;
+    using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
     using System.ComponentModel;
     using System.IO;
-    using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-    using OSGeo.MapGuide.ObjectModels.Common;
-    
+
     /// <summary>
     /// A 2D simple symbol for stylization.
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/SymbolDefinition-2.4.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/SymbolDefinition-2.4.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/SymbolDefinition-2.4.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,17 +5,13 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.SymbolDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeF
 ields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition.v2_4_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition.v2_4_0
+{
+    using OSGeo.MapGuide.ObjectModels.Common;
+    using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
     using System.ComponentModel;
     using System.IO;
-    using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-    using OSGeo.MapGuide.ObjectModels.Common;
-    
+
     /// <summary>
     /// A 2D simple symbol for stylization.
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/SymbolLibrary-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/SymbolLibrary-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/SymbolLibrary-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.SymbolLibrary</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFiel
 ds>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.SymbolLibrary.v1_0_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.SymbolLibrary.v1_0_0
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]

Modified: trunk/Tools/Maestro/Generated/TileSetDefinition-3.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/TileSetDefinition-3.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/TileSetDefinition-3.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,17 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.TileSetDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLazyLoading>False</EnableLazyLoading><TrackingChangesEnable>False</TrackingChangesEnable><GenTrackingClasses>False</GenTrackingClasses><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><VirtualProp>False</VirtualProp><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenBaseClass>False</GenBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><OrderXMLAttri
 b>False</OrderXMLAttrib><EnableEncoding>False</EnableEncoding><AutomaticProperties>False</AutomaticProperties><GenerateShouldSerialize>False</GenerateShouldSerialize><DisableDebug>False</DisableDebug><PropNameSpecified>Default</PropNameSpecified><Encoder>UTF8</Encoder><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>False</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.TileSetDefinition.v3_0_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.TileSetDefinition.v3_0_0
+{
     using System.ComponentModel;
     using System.IO;
-    using System.Text;
-    
-    
+
+
     /// <summary>
     /// Defines a tile cache
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/UnmanagedDataList-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/UnmanagedDataList-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/UnmanagedDataList-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>Fals
 e</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.Common {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.Common
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     /// <summary>
     /// Unmanaged data list
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/UserList-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/UserList-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/UserList-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.Common</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>Fals
 e</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.Common {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.Common
+{
     using System.ComponentModel;
     using System.IO;
-    
-    
+
+
     /// <summary>
     /// User list
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/WatermarkDefinition-2.3.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/WatermarkDefinition-2.3.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/WatermarkDefinition-2.3.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,20 +5,14 @@
 //    <NameSpace>WatermarkDefinition-2.3.0.cs</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLazyLoading>False</EnableLazyLoading><TrackingChangesEnable>False</TrackingChangesEnable><GenTrackingClasses>False</GenTrackingClasses><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><VirtualProp>False</VirtualProp><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenBaseClass>False</GenBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><EnableEncoding>False</EnableEn
 coding><AutomaticProperties>False</AutomaticProperties><GenerateShouldSerialize>False</GenerateShouldSerialize><DisableDebug>False</DisableDebug><PropNameSpecified>Default</PropNameSpecified><Encoder>UTF8</Encoder><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_3_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
-    using System.ComponentModel;
-    using System.IO;
-    using System.Text;
-    using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
-    using OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_0_0;
+namespace OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_3_0
+{
     using OSGeo.MapGuide.ObjectModels.Common;
     using OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0;
-    
+    using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
+    using System.ComponentModel;
+    using System.IO;
+
     /// <summary>
     /// The specification of a watermark.
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/WatermarkDefinition-2.4.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/WatermarkDefinition-2.4.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/WatermarkDefinition-2.4.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,19 +5,14 @@
 //    <NameSpace>WatermarkDefinition-2.3.0.cs</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLazyLoading>False</EnableLazyLoading><TrackingChangesEnable>False</TrackingChangesEnable><GenTrackingClasses>False</GenTrackingClasses><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><VirtualProp>False</VirtualProp><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenBaseClass>False</GenBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><EnableEncoding>False</EnableEn
 coding><AutomaticProperties>False</AutomaticProperties><GenerateShouldSerialize>False</GenerateShouldSerialize><DisableDebug>False</DisableDebug><PropNameSpecified>Default</PropNameSpecified><Encoder>UTF8</Encoder><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>True</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_4_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
-    using System.ComponentModel;
-    using System.IO;
-    using System.Text;
-    using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
+namespace OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_4_0
+{
     using OSGeo.MapGuide.ObjectModels.Common;
     using OSGeo.MapGuide.ObjectModels.SymbolDefinition.v2_4_0;
-    
+    using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
+    using System.ComponentModel;
+    using System.IO;
+
     /// <summary>
     /// The specification of a watermark.
     /// </summary>

Modified: trunk/Tools/Maestro/Generated/WebLayout-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/WebLayout-1.0.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/WebLayout-1.0.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.WebLayout</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>F
 alse</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.WebLayout.v1_0_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.WebLayout.v1_0_0
+{
+    using OSGeo.MapGuide.ObjectModels.WebLayout;
     using System.ComponentModel;
     using System.IO;
-    using OSGeo.MapGuide.ObjectModels.WebLayout;
-    
+
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]

Modified: trunk/Tools/Maestro/Generated/WebLayout-1.1.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/WebLayout-1.1.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/WebLayout-1.1.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -10,17 +10,13 @@
 #elif WL240
 namespace OSGeo.MapGuide.ObjectModels.WebLayout.v2_4_0 {
 #else
-namespace OSGeo.MapGuide.ObjectModels.WebLayout.v1_1_0 {
+namespace OSGeo.MapGuide.ObjectModels.WebLayout.v1_1_0
+{
 #endif
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+    using OSGeo.MapGuide.ObjectModels.WebLayout;
     using System.ComponentModel;
     using System.IO;
-    using OSGeo.MapGuide.ObjectModels.WebLayout;
-    
+
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]

Modified: trunk/Tools/Maestro/Generated/WebLayout-2.4.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/WebLayout-2.4.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/WebLayout-2.4.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.WebLayout</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>F
 alse</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.WebLayout.v2_4_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.WebLayout.v2_4_0
+{
+    using OSGeo.MapGuide.ObjectModels.WebLayout;
     using System.ComponentModel;
     using System.IO;
-    using OSGeo.MapGuide.ObjectModels.WebLayout;
-    
+
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]

Modified: trunk/Tools/Maestro/Generated/WebLayout-2.6.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/WebLayout-2.6.0.designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Generated/WebLayout-2.6.0.designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -5,16 +5,12 @@
 //    <NameSpace>OSGeo.MapGuide.ObjectModels.WebLayout</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableInitializeFields>F
 alse</EnableInitializeFields>
 //  </auto-generated>
 // ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.WebLayout.v2_6_0 {
-    using System;
-    using System.Diagnostics;
-    using System.Xml.Serialization;
-    using System.Collections;
-    using System.Xml.Schema;
+namespace OSGeo.MapGuide.ObjectModels.WebLayout.v2_6_0
+{
+    using OSGeo.MapGuide.ObjectModels.WebLayout;
     using System.ComponentModel;
     using System.IO;
-    using OSGeo.MapGuide.ObjectModels.WebLayout;
-    
+
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]

Modified: trunk/Tools/Maestro/LocalConfigure/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/LocalConfigure/Properties/Resources.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/LocalConfigure/Properties/Resources.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace LocalConfigure.Properties {
-    using System;
-    
-    
+namespace LocalConfigure.Properties
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/Properties/Resources.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro/Properties/Resources.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.Properties {
-    using System;
-    
-    
+namespace Maestro.Properties
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/Strings.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro/Strings.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro {
-    using System;
-    
-    
+namespace Maestro
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.AddIn.ExtendedObjectModels.Properties {
-    using System;
-    
-    
+namespace Maestro.AddIn.ExtendedObjectModels.Properties
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Strings.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Strings.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.AddIn.ExtendedObjectModels {
-    using System;
-    
-    
+namespace Maestro.AddIn.ExtendedObjectModels
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition230ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition230ItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition230ItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using Maestro.Base.Templates;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition240ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition240ItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition240ItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using Maestro.Base.Templates;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition300ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition300ItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/MapDefinition300ItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using Maestro.Base.Templates;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SQLiteLoadProcedureItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SQLiteLoadProcedureItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SQLiteLoadProcedureItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 using Maestro.Base.Templates;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LoadProcedure;
 using System;

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SymbolDefinition110ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SymbolDefinition110ItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SymbolDefinition110ItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Base.Templates;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SymbolDefinition240ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SymbolDefinition240ItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SymbolDefinition240ItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Base.Templates;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/TileSetDefinition300ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/TileSetDefinition300ItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/TileSetDefinition300ItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -25,10 +25,6 @@
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.TileSetDefinition;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
 
 namespace Maestro.AddIn.ExtendedObjectModels.Templates

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer110ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer110ItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer110ItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Base.Templates;
 using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer120ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer120ItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer120ItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Base.Templates;
 using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer130ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer130ItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer130ItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Base.Templates;
 using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer230ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer230ItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer230ItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Base.Templates;
 using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer240ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer240ItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/VectorLayer240ItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Base.Templates;
 using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition230ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition230ItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition230ItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using Maestro.Base.Templates;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition240ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition240ItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition240ItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using Maestro.Base.Templates;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout110ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout110ItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout110ItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 using Maestro.Base.Templates;
 using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout240ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout240ItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout240ItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 using Maestro.Base.Templates;
 using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;

Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout260ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout260ItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WebLayout260ItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 using Maestro.Base.Templates;
 using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;

Modified: trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Properties/Resources.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.FdoToolbox/Properties/Resources.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.AddIn.FdoToolbox.Properties {
-    using System;
-    
-    
+namespace Maestro.AddIn.FdoToolbox.Properties
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.AddIn.Local.Properties {
-    using System;
-    
-    
+namespace Maestro.AddIn.Local.Properties
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Services/LocalPreviewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Services/LocalPreviewer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Services/LocalPreviewer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,7 +24,6 @@
 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;

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Strings.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Strings.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.AddIn.Local {
-    using System;
-    
-    
+namespace Maestro.AddIn.Local
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro.AddIn.Rest/Model/DataConfigurationList.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Rest/Model/DataConfigurationList.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.Rest/Model/DataConfigurationList.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -19,11 +19,7 @@
 //
 
 #endregion Disclaimer / License
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Maestro.AddIn.Rest.Model
 {

Modified: trunk/Tools/Maestro/Maestro.AddIn.Rest/Model/DataFileList.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Rest/Model/DataFileList.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.Rest/Model/DataFileList.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -19,11 +19,7 @@
 //
 
 #endregion Disclaimer / License
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Maestro.AddIn.Rest.Model
 {

Modified: trunk/Tools/Maestro/Maestro.AddIn.Rest/Model/RestSourceContext.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Rest/Model/RestSourceContext.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.Rest/Model/RestSourceContext.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,13 +23,8 @@
 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.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Maestro.AddIn.Rest.Model
 {

Modified: trunk/Tools/Maestro/Maestro.AddIn.Rest/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Rest/Properties/AssemblyInfo.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.Rest/Properties/AssemblyInfo.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

Modified: trunk/Tools/Maestro/Maestro.AddIn.Rest/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Rest/Strings.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.Rest/Strings.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.AddIn.Rest {
-    using System;
-    
-    
+namespace Maestro.AddIn.Rest
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro.AddIn.Rest/UI/Methods/GetMethodCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Rest/UI/Methods/GetMethodCtrl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.Rest/UI/Methods/GetMethodCtrl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -19,17 +19,14 @@
 //
 
 #endregion Disclaimer / License
+using Maestro.AddIn.Rest.Model;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
 using System.Data;
+using System.Dynamic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
-using System.Dynamic;
-using Maestro.AddIn.Rest.Model;
 
 namespace Maestro.AddIn.Rest.UI.Methods
 {

Modified: trunk/Tools/Maestro/Maestro.AddIn.Rest/UI/RestExplorer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Rest/UI/RestExplorer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.Rest/UI/RestExplorer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -19,21 +19,14 @@
 //
 
 #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.Threading.Tasks;
-using System.Windows.Forms;
-using Maestro.Shared.UI;
-using RestSharp;
 using Maestro.AddIn.Rest.Model;
-using OSGeo.MapGuide.MaestroAPI;
 using Maestro.Base.Services;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI;
+using RestSharp;
+using System;
 using System.IO;
+using System.Windows.Forms;
 
 namespace Maestro.AddIn.Rest.UI
 {

Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/PythonOutputStream.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/PythonOutputStream.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Lang/Python/PythonOutputStream.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -37,7 +37,6 @@
 using System.IO;
 using System.Text;
 using System.Threading;
-using System.Windows.Forms;
 
 namespace Maestro.AddIn.Scripting.Lang.Python
 {

Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/Properties/Resources.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Properties/Resources.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.AddIn.Scripting.Properties {
-    using System;
-    
-    
+namespace Maestro.AddIn.Scripting.Properties
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/Strings.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Strings.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.AddIn.Scripting {
-    using System;
-    
-    
+namespace Maestro.AddIn.Scripting
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronPythonRepl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronPythonRepl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/UI/IronPythonRepl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -1,10 +1,10 @@
-using Maestro.Editors.Common;
+using ICSharpCode.Core;
+using Maestro.AddIn.Scripting.Lang.Python;
+using Maestro.Editors.Common;
 using Maestro.Shared.UI;
 using Microsoft.Scripting.Hosting.Shell;
 using System;
 using System.Windows.Forms;
-using ICSharpCode.Core;
-using Maestro.AddIn.Scripting.Lang.Python;
 
 namespace Maestro.AddIn.Scripting.UI
 {

Modified: trunk/Tools/Maestro/Maestro.AddInManager/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddInManager/Strings.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.AddInManager/Strings.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.AddInManager {
-    using System;
-    
-    
+namespace Maestro.AddInManager
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/PasteCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/PasteCommand.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/PasteCommand.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,7 +24,6 @@
 using Maestro.Base.Services;
 using Maestro.Base.UI;
 using Maestro.Editors;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using System.Collections.Generic;

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SaveResourceAsCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SaveResourceAsCommand.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SaveResourceAsCommand.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -25,7 +25,6 @@
 using Maestro.Base.Services;
 using Maestro.Editors.Generic;
 using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DeleteSelectedItemsCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DeleteSelectedItemsCommand.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DeleteSelectedItemsCommand.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,8 +24,6 @@
 using Maestro.Base.Services;
 using Maestro.Base.UI;
 using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System.Collections.Generic;
 using System.Linq;

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DuplicateResourceCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DuplicateResourceCommand.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/DuplicateResourceCommand.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Base.UI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System.Collections.Generic;
 

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/GetLayerSpatialContextCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/GetLayerSpatialContextCommand.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/GetLayerSpatialContextCommand.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,7 +24,6 @@
 using Maestro.Base.Services;
 using Maestro.Editors.FeatureSource;
 using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.Common;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/PurgeFeatureSourceCacheCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/PurgeFeatureSourceCacheCommand.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/PurgeFeatureSourceCacheCommand.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using ICSharpCode.Core;
 using Maestro.Base.Services;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RenameCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RenameCommand.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RenameCommand.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -25,7 +25,6 @@
 using Maestro.Base.UI;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System.Collections.Generic;
 

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RepointCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RepointCommand.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/RepointCommand.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -25,7 +25,6 @@
 using Maestro.Editors.Common;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System.IO;
 using System.Xml;

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ShowSpatialContextsCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ShowSpatialContextsCommand.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/ShowSpatialContextsCommand.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Editors.FeatureSource;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 
 namespace Maestro.Base.Commands.SiteExplorer

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/TestResourceCompatibilityCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/TestResourceCompatibilityCommand.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/TestResourceCompatibilityCommand.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -26,7 +26,6 @@
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Capability;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.Common;
 using System;

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenSymbolBrowserCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenSymbolBrowserCommand.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Test/OpenSymbolBrowserCommand.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,7 +24,6 @@
 using Maestro.Base.Services;
 using Maestro.Editors.Common;
 using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 
 namespace Maestro.Base.Commands.Test

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/Test/TestCommands.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/Test/TestCommands.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/Test/TestCommands.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 using ICSharpCode.Core;
 using Maestro.Base.Services;
 using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 
 namespace Maestro.Base.Commands.Test

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/FeatureSourceEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/FeatureSourceEditor.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/FeatureSourceEditor.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 using ICSharpCode.Core;
 using Maestro.Editors;
 using Maestro.Editors.FeatureSource;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using System;

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/FusionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/FusionEditor.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/FusionEditor.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Editors;
 using Maestro.Editors.Fusion;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System.Drawing;
 using System.Windows.Forms;

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/IEditorFactory.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/IEditorFactory.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/IEditorFactory.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,7 +20,6 @@
 
 #endregion Disclaimer / License
 
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 
 namespace Maestro.Base.Editor

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/IEditorViewContent.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/IEditorViewContent.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/IEditorViewContent.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Editors;
 using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/LayerDefinitionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/LayerDefinitionEditor.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/LayerDefinitionEditor.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 using ICSharpCode.Core;
 using Maestro.Editors;
 using Maestro.Editors.LayerDefinition;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using OSGeo.MapGuide.ObjectModels.MapDefinition;

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/MapDefinitionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/MapDefinitionEditor.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/MapDefinitionEditor.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 using ICSharpCode.Core;
 using Maestro.Editors;
 using Maestro.Editors.MapDefinition;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using OSGeo.MapGuide.ObjectModels.TileSetDefinition;

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/TileSetEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/TileSetEditor.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/TileSetEditor.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -19,17 +19,10 @@
 //
 
 #endregion Disclaimer / License
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
+using Maestro.Editors.TileSetDefinition;
+using OSGeo.MapGuide.ObjectModels.TileSetDefinition;
 using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.TileSetDefinition;
-using Maestro.Editors.TileSetDefinition;
 
 namespace Maestro.Base.Editor
 {

Modified: trunk/Tools/Maestro/Maestro.Base/Editor/WatermarkDefinitionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/WatermarkDefinitionEditor.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/WatermarkDefinitionEditor.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Editors;
 using Maestro.Editors.WatermarkDefinition;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System.Drawing;
 using System.Windows.Forms;

Modified: trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.Base.Properties {
-    using System;
-    
-    
+namespace Maestro.Base.Properties
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro.Base/Services/ClipboardService.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/ClipboardService.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Services/ClipboardService.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Base.UI;
 using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 
 namespace Maestro.Base.Services

Modified: trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/DwfFileHandler.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/DwfFileHandler.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/DwfFileHandler.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.DrawingSource;
 using System;

Modified: trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SdfFileHandler.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SdfFileHandler.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SdfFileHandler.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using System.IO;

Modified: trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/ShpFileHandler.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/ShpFileHandler.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/ShpFileHandler.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using System.IO;

Modified: trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SltFileHandler.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SltFileHandler.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Services/DragDropHandlers/SltFileHandler.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using System.IO;

Modified: trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -25,7 +25,6 @@
 using Maestro.Base.UI;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using System.Collections.Generic;

Modified: trunk/Tools/Maestro/Maestro.Base/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Strings.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Strings.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.Base {
-    using System;
-    
-    
+namespace Maestro.Base
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/ApplicationDefinitionItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/ApplicationDefinitionItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/ApplicationDefinitionItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 using System;

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/DrawingLayerDefinitionItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/DrawingLayerDefinitionItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/DrawingLayerDefinitionItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/DrawingSourceItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/DrawingSourceItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/DrawingSourceItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using Res = Maestro.Base.Properties.Resources;
 

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/DwfLoadProcedureItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/DwfLoadProcedureItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/DwfLoadProcedureItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LoadProcedure;
 

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/FeatureSourceItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/FeatureSourceItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/FeatureSourceItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Editors.Common;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using Res = Maestro.Base.Properties.Resources;
 

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/ItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/ItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using System.Drawing;

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/MapDefinitionItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/MapDefinitionItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/MapDefinitionItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using Res = Maestro.Base.Properties.Resources;

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/PrintLayoutItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/PrintLayoutItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/PrintLayoutItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using Res = Maestro.Base.Properties.Resources;
 

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/RasterLayerDefinitionItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/RasterLayerDefinitionItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/RasterLayerDefinitionItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/SdfLoadProcedureItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/SdfLoadProcedureItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/SdfLoadProcedureItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LoadProcedure;
 

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/ShpLoadProcedureItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/ShpLoadProcedureItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/ShpLoadProcedureItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LoadProcedure;
 

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/SymbolDefinitionItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/SymbolDefinitionItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/SymbolDefinitionItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using Res = Maestro.Base.Properties.Resources;

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/UserItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/UserItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/UserItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System.IO;
 using Res = Maestro.Base.Properties.Resources;

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/VectorLayerDefinitionItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/VectorLayerDefinitionItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/VectorLayerDefinitionItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;

Modified: trunk/Tools/Maestro/Maestro.Base/Templates/WebLayoutItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/WebLayoutItemTemplate.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/WebLayoutItemTemplate.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using Res = Maestro.Base.Properties.Resources;

Modified: trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Maestro.Base.UI
+namespace Maestro.Base.UI
 {
     partial class AboutDialog
     {

Modified: trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Base.Services;
 using OSGeo.MapGuide.MaestroAPI;
-using System;
 using System.Diagnostics;
 using System.Windows.Forms;
 

Modified: trunk/Tools/Maestro/Maestro.Base/UI/ISiteExplorer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/ISiteExplorer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/UI/ISiteExplorer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI;
 using System;
 
 namespace Maestro.Base.UI

Modified: trunk/Tools/Maestro/Maestro.Base/UI/OpenResourceIdDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/OpenResourceIdDialog.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/UI/OpenResourceIdDialog.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 using Maestro.Base.Services;
 using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using System.Collections.Generic;

Modified: trunk/Tools/Maestro/Maestro.Base/UI/Packaging/CreatePackageDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/Packaging/CreatePackageDialog.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/UI/Packaging/CreatePackageDialog.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 using Maestro.Editors.Generic;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using System.Collections.Generic;

Modified: trunk/Tools/Maestro/Maestro.Base/UI/ProfilingDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/ProfilingDialog.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/UI/ProfilingDialog.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,7 +24,6 @@
 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;

Modified: trunk/Tools/Maestro/Maestro.Base/UI/RepositoryTreeModel.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/RepositoryTreeModel.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/UI/RepositoryTreeModel.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 using Aga.Controls.Tree;
 using Maestro.Base.Services;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.Common;
 using System;

Modified: trunk/Tools/Maestro/Maestro.Base/UI/ResourceIdNavigator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/ResourceIdNavigator.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/UI/ResourceIdNavigator.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -25,7 +25,6 @@
 using Maestro.Base.Services;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using System.Windows.Forms;

Modified: trunk/Tools/Maestro/Maestro.Base/UI/ResourcePropertiesDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/ResourcePropertiesDialog.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/UI/ResourcePropertiesDialog.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,7 +24,6 @@
 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;

Modified: trunk/Tools/Maestro/Maestro.Base/UI/SiteExplorer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/SiteExplorer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/UI/SiteExplorer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -31,7 +31,6 @@
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.CrossConnection;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using System.Collections.Generic;

Modified: trunk/Tools/Maestro/Maestro.Base/WorkbenchInitializer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/WorkbenchInitializer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Base/WorkbenchInitializer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,8 +24,8 @@
 using Maestro.Base.Services;
 using Maestro.Shared.UI;
 using System.Collections.Generic;
+using System.Linq;
 using System.Windows.Forms;
-using System.Linq;
 
 namespace Maestro.Base
 {

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/EditorWindow.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/EditorWindow.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/EditorWindow.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Editors.Preview;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using System.IO;

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/Expression/ExpressionDisplayDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/Expression/ExpressionDisplayDialog.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/Expression/ExpressionDisplayDialog.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,13 +21,6 @@
 #endregion Disclaimer / License
 using OSGeo.FDO.Expressions;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.Common.Expression

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/Expression/ExpressionParseErrorDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/Expression/ExpressionParseErrorDialog.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/Expression/ExpressionParseErrorDialog.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -19,15 +19,7 @@
 //
 
 #endregion Disclaimer / License
-using OSGeo.FDO.Expressions;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.Common.Expression

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/Expression/FdoExpressionValidator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/Expression/FdoExpressionValidator.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/Expression/FdoExpressionValidator.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,10 +23,7 @@
 using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.ObjectModels.Capabilities;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Maestro.Editors.Common.Expression
 {

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/Expression/MalformedExpressionDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/Expression/MalformedExpressionDialog.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/Expression/MalformedExpressionDialog.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,13 +21,7 @@
 #endregion Disclaimer / License
 using OSGeo.FDO.Expressions;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.Common.Expression

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ExpressionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ExpressionEditor.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ExpressionEditor.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -25,18 +25,18 @@
 using Maestro.Editors.Generic.XmlEditor;
 using Maestro.Editors.LayerDefinition.Vector.Thematics;
 using Maestro.Shared.UI;
+using OSGeo.FDO.Expressions;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using OSGeo.FDO.Expressions;
 using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels.Capabilities;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.MaestroAPI.Services;
 
 namespace Maestro.Editors.Common
 {

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/MonoCompatibleExpressionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/MonoCompatibleExpressionEditor.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/MonoCompatibleExpressionEditor.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,19 +23,17 @@
 using Maestro.Editors.Common.Expression;
 using Maestro.Editors.LayerDefinition.Vector.Thematics;
 using Maestro.Shared.UI;
+using OSGeo.FDO.Expressions;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using OSGeo.FDO.Expressions;
 using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels.Capabilities;
-using OSGeo.MapGuide.ObjectModels.Capabilities.v1_0_0;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
-using OSGeo.MapGuide.MaestroAPI.Services;
 
 namespace Maestro.Editors.Common
 {

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/RepointerDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/RepointerDialog.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/RepointerDialog.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using System.Collections.Generic;

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/RepositoryView.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,7 +20,6 @@
 
 #endregion Disclaimer / License
 
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.Common;

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.Common;
 using System;

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,8 +23,6 @@
 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;
 using OSGeo.MapGuide.ObjectModels.Common;
 using System;

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/SymbolPicker.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/SymbolPicker.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/SymbolPicker.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 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 OSGeo.MapGuide.ObjectModels;

Modified: trunk/Tools/Maestro/Maestro.Editors/Diff/CompareResourceDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Diff/CompareResourceDialog.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Diff/CompareResourceDialog.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Resource.Comparison;
 using OSGeo.MapGuide.ObjectModels;
 using System;

Modified: trunk/Tools/Maestro/Maestro.Editors/Diff/XmlCompareUtil.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Diff/XmlCompareUtil.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Diff/XmlCompareUtil.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,8 +20,6 @@
 
 #endregion Disclaimer / License
 
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Resource.Comparison;
 using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels;

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/ExtendedClassSettings.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/ExtendedClassSettings.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/ExtendedClassSettings.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,9 +24,9 @@
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
-using System.Linq;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.FeatureSource.Extensions

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 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.ObjectModels.FeatureSource;

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcProviderCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcProviderCtrl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcProviderCtrl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -26,7 +26,6 @@
 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;
 using OSGeo.MapGuide.ObjectModels.FeatureSource;

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 using Maestro.Editors.Common;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
 using System.Collections.Generic;

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 using Maestro.Editors.Common;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
 using System.ComponentModel;

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/SpatialContextsDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/SpatialContextsDialog.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/SpatialContextsDialog.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using OSGeo.MapGuide.MaestroAPI.Services;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
 using System.Windows.Forms;
 

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/FusionWidgetEditorMap.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/FusionWidgetEditorMap.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/FusionWidgetEditorMap.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using Maestro.Editors.Fusion.WidgetEditors;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;
 

Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/MapSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/MapSettingsCtrl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/MapSettingsCtrl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 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;
 using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlElementPath.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlElementPath.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditor/AutoCompletion/XmlElementPath.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -31,7 +31,6 @@
 
 #endregion Disclaimer / License
 
-using System;
 using System.Text;
 
 namespace Maestro.Editors.Generic.XmlEditor.AutoCompletion

Modified: trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Generic/XmlEditorCtrl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -26,10 +26,10 @@
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.IO;
 using System;
-using System.Linq;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
+using System.Linq;
 using System.Windows.Forms;
 using System.Xml;
 

Modified: trunk/Tools/Maestro/Maestro.Editors/IEditorService.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/IEditorService.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/IEditorService.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Editors.Common;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels;

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ExplodeThemeDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ExplodeThemeDialog.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ExplodeThemeDialog.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System;

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceEditors/ReferenceCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceEditors/ReferenceCtrl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceEditors/ReferenceCtrl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Editors.Generic;
 using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -34,12 +34,12 @@
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
-using System.Linq;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.LayerDefinition.Vector.Scales

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
+namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
 {
     partial class AreaFeatureStyleEditor
     {

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
+namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
 {
     partial class FillStyleEditor
     {

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
+namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
 {
     partial class FontStyleEditor
     {

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ExtentCalculationDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ExtentCalculationDialog.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ExtentCalculationDialog.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -26,9 +26,9 @@
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using System;
-using System.Linq;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.MapDefinition

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/FiniteScaleListCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/FiniteScaleListCtrl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/FiniteScaleListCtrl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,8 +24,8 @@
 using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using OSGeo.MapGuide.ObjectModels.TileSetDefinition;
 using System;
+using System.ComponentModel;
 using System.Linq;
-using System.ComponentModel;
 using System.Windows.Forms;
 
 namespace Maestro.Editors.MapDefinition

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 using Maestro.Editors.Generic;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using System;

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapDefinitionEditorCtrl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,9 +23,7 @@
 using Maestro.Editors.MapDefinition.Live;
 using Maestro.MapViewer;
 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;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorDrawOrder.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorDrawOrder.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorDrawOrder.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,9 +22,7 @@
 
 using Maestro.Editors.MapDefinition.Live;
 using Maestro.MapViewer;
-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.LayerDefinition;

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorLegend.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorLegend.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorLegend.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,9 +24,7 @@
 using Maestro.Editors.MapDefinition.Live;
 using Maestro.MapViewer;
 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;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorRepositoryView.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorRepositoryView.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LiveMapEditorRepositoryView.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,8 +20,6 @@
 
 #endregion Disclaimer / License
 
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.Common;

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,7 +24,6 @@
 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;
 using OSGeo.MapGuide.ObjectModels.MapDefinition;

Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ScaleListGenerator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ScaleListGenerator.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/ScaleListGenerator.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,7 +20,6 @@
 
 #endregion Disclaimer / License
 
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using System.Collections.Generic;

Modified: trunk/Tools/Maestro/Maestro.Editors/Packaging/PackageEditorDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Packaging/PackageEditorDialog.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Packaging/PackageEditorDialog.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 using Maestro.Packaging;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Exceptions;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using System.Collections.Generic;

Modified: trunk/Tools/Maestro/Maestro.Editors/Preview/DefaultResourcePreviewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Preview/DefaultResourcePreviewer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Preview/DefaultResourcePreviewer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 using Maestro.Editors.SymbolDefinition;
 using Maestro.Shared.UI;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;

Modified: trunk/Tools/Maestro/Maestro.Editors/Preview/IResourcePreviewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Preview/IResourcePreviewer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Preview/IResourcePreviewer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 
 namespace Maestro.Editors.Preview

Modified: trunk/Tools/Maestro/Maestro.Editors/Preview/LocalMapPreviewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Preview/LocalMapPreviewer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Preview/LocalMapPreviewer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 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.LayerDefinition;

Modified: trunk/Tools/Maestro/Maestro.Editors/Preview/ResourcePreviewEngine.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Preview/ResourcePreviewEngine.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Preview/ResourcePreviewEngine.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using OSGeo.MapGuide.ObjectModels.MapDefinition;

Modified: trunk/Tools/Maestro/Maestro.Editors/Preview/ResourcePreviewFactory.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Preview/ResourcePreviewFactory.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Preview/ResourcePreviewFactory.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System.Collections.Generic;
 

Modified: trunk/Tools/Maestro/Maestro.Editors/Preview/StubPreviewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Preview/StubPreviewer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Preview/StubPreviewer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 
 namespace Maestro.Editors.Preview

Modified: trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.Editors.Properties {
-    using System;
-    
-    
+namespace Maestro.Editors.Properties
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro.Editors/RepositoryHandle.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/RepositoryHandle.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/RepositoryHandle.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 
 namespace Maestro.Editors

Modified: trunk/Tools/Maestro/Maestro.Editors/ResourceEditorServiceBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/ResourceEditorServiceBase.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/ResourceEditorServiceBase.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,7 +23,6 @@
 using Maestro.Editors.Common;
 using Maestro.Editors.Generic;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels;

Modified: trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.Editors {
-    using System;
-    
-    
+namespace Maestro.Editors
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.Common;
 using System;

Modified: trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/LayerStructureCtrl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -19,24 +19,21 @@
 //
 
 #endregion Disclaimer / License
+using Aga.Controls.Tree;
+using Maestro.Editors.Common;
+using Maestro.Editors.Generic;
+using Maestro.Editors.MapDefinition;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Tile;
+using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.ObjectModels.MapDefinition;
+using OSGeo.MapGuide.ObjectModels.TileSetDefinition;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
-using System.Data;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.ObjectModels.TileSetDefinition;
-using Maestro.Editors.MapDefinition;
-using Aga.Controls.Tree;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.MapDefinition;
-using OSGeo.MapGuide.ObjectModels;
-using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI.Tile;
 
 namespace Maestro.Editors.TileSetDefinition
 {

Modified: trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/Providers/GenericProviderCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/Providers/GenericProviderCtrl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/Providers/GenericProviderCtrl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -19,18 +19,13 @@
 //
 
 #endregion Disclaimer / License
+using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.ObjectModels.Common;
+using OSGeo.MapGuide.ObjectModels.TileSetDefinition;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
-using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels.TileSetDefinition;
-using OSGeo.MapGuide.ObjectModels;
 
 namespace Maestro.Editors.TileSetDefinition.Providers
 {

Modified: trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/TileSetDefinitionEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/TileSetDefinitionEditorCtrl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/TileSetDefinitionEditorCtrl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -19,15 +19,6 @@
 //
 
 #endregion Disclaimer / License
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using OSGeo.MapGuide.MaestroAPI.Commands;
 
 namespace Maestro.Editors.TileSetDefinition
 {

Modified: trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/TileSetSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/TileSetSettingsCtrl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/TileSetDefinition/TileSetSettingsCtrl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -19,21 +19,18 @@
 //
 
 #endregion Disclaimer / License
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 using Maestro.Editors.Common;
+using Maestro.Editors.MapDefinition;
+using Maestro.Editors.TileSetDefinition.Providers;
 using OSGeo.MapGuide.MaestroAPI.Commands;
 using OSGeo.MapGuide.ObjectModels.Common;
-using Maestro.Editors.TileSetDefinition.Providers;
 using OSGeo.MapGuide.ObjectModels.TileSetDefinition;
-using Maestro.Editors.MapDefinition;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Globalization;
+using System.Linq;
+using System.Windows.Forms;
 
 namespace Maestro.Editors.TileSetDefinition
 {

Modified: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Editors.Generic;
 using Maestro.Shared.UI;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 using System;

Modified: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 using System;

Modified: trunk/Tools/Maestro/Maestro.LiveMapEditor/AboutDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.LiveMapEditor/AboutDialog.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/AboutDialog.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,7 +20,6 @@
 
 #endregion Disclaimer / License
 
-using System;
 using System.Reflection;
 using System.Windows.Forms;
 

Modified: trunk/Tools/Maestro/Maestro.LiveMapEditor/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.LiveMapEditor/Properties/Resources.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/Properties/Resources.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.LiveMapEditor.Properties {
-    using System;
-    
-    
+namespace Maestro.LiveMapEditor.Properties
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro.LiveMapEditor/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.LiveMapEditor/Strings.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.LiveMapEditor/Strings.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.LiveMapEditor {
-    using System;
-    
-    
+namespace Maestro.LiveMapEditor
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro.Login/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Login/Strings.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Login/Strings.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.Login {
-    using System;
-    
-    
+namespace Maestro.Login
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro.MapViewer/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.MapViewer/Properties/Resources.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.MapViewer/Properties/Resources.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.MapViewer.Properties {
-    using System;
-    
-    
+namespace Maestro.MapViewer.Properties
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro.Packaging/PackageBuilder.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/PackageBuilder.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Packaging/PackageBuilder.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using ICSharpCode.SharpZipLib.Zip;
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.Common;
 using System;

Modified: trunk/Tools/Maestro/Maestro.Packaging/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/Properties/Resources.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Packaging/Properties/Resources.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.Packaging.Properties {
-    using System;
-    
-    
+namespace Maestro.Packaging.Properties
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro.Packaging/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Packaging/Strings.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Packaging/Strings.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.Packaging {
-    using System;
-    
-    
+namespace Maestro.Packaging
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/Properties/Resources.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/Properties/Resources.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.Shared.UI.Properties {
-    using System;
-    
-    
+namespace Maestro.Shared.UI.Properties
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/Maestro.Shared.UI/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/Strings.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/Strings.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Maestro.Shared.UI {
-    using System;
-    
-    
+namespace Maestro.Shared.UI
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/MaestroFsPreview/MainForm.cs
===================================================================
--- trunk/Tools/Maestro/MaestroFsPreview/MainForm.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/MaestroFsPreview/MainForm.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using Maestro.Editors;
 using Maestro.Editors.Generic;
-using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;

Modified: trunk/Tools/Maestro/MaestroFsPreview/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/MaestroFsPreview/Properties/Resources.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/MaestroFsPreview/Properties/Resources.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace MaestroFsPreview.Properties {
-    using System;
-    
-    
+namespace MaestroFsPreview.Properties
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/MgCooker/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/Properties/Resources.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/MgCooker/Properties/Resources.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace MgCooker.Properties {
-    using System;
-    
-    
+namespace MgCooker.Properties
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/MgCooker/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/Strings.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/MgCooker/Strings.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace MgCooker {
-    using System;
-    
-    
+namespace MgCooker
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoBinaryExpression.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoBinaryExpression.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoBinaryExpression.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,11 +20,6 @@
 
 #endregion Disclaimer / License
 using Irony.Parsing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.FDO.Expressions
 {

Modified: trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoBinaryLogicalOperator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoBinaryLogicalOperator.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoBinaryLogicalOperator.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -19,11 +19,6 @@
 //
 
 #endregion Disclaimer / License
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.FDO.Expressions
 {

Modified: trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoComparisonCondition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoComparisonCondition.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoComparisonCondition.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,11 +20,6 @@
 
 #endregion Disclaimer / License
 using Irony.Parsing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.FDO.Expressions
 {

Modified: trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoDistanceCondition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoDistanceCondition.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoDistanceCondition.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,11 +20,6 @@
 
 #endregion Disclaimer / License
 using Irony.Parsing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.FDO.Expressions
 {

Modified: trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoExpressionGrammar.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoExpressionGrammar.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoExpressionGrammar.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,10 +20,6 @@
 
 #endregion Disclaimer / License
 using Irony.Parsing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.FDO.Expressions
 {

Modified: trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoFilterGrammar.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoFilterGrammar.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoFilterGrammar.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,10 +20,6 @@
 
 #endregion Disclaimer / License
 using Irony.Parsing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.FDO.Expressions
 {

Modified: trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoFunction.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoFunction.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoFunction.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,11 +20,7 @@
 
 #endregion Disclaimer / License
 using Irony.Parsing;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.FDO.Expressions
 {

Modified: trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoGeometricCondition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoGeometricCondition.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoGeometricCondition.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,11 +20,6 @@
 
 #endregion Disclaimer / License
 using Irony.Parsing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.FDO.Expressions
 {

Modified: trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoGeometryValue.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoGeometryValue.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoGeometryValue.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,11 +20,6 @@
 
 #endregion Disclaimer / License
 using Irony.Parsing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.FDO.Expressions
 {

Modified: trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoInCondition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoInCondition.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoInCondition.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,11 +20,7 @@
 
 #endregion Disclaimer / License
 using Irony.Parsing;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.FDO.Expressions
 {

Modified: trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoLiteralValue.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoLiteralValue.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoLiteralValue.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,11 +20,6 @@
 
 #endregion Disclaimer / License
 using Irony.Parsing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.FDO.Expressions
 {

Modified: trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoLogicalOperator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoLogicalOperator.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoLogicalOperator.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,11 +20,6 @@
 
 #endregion Disclaimer / License
 using Irony.Parsing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.FDO.Expressions
 {

Modified: trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoParseable.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoParseable.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoParseable.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -19,11 +19,6 @@
 //
 
 #endregion Disclaimer / License
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.FDO.Expressions
 {

Modified: trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoSearchCondition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoSearchCondition.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoSearchCondition.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,11 +20,6 @@
 
 #endregion Disclaimer / License
 using Irony.Parsing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.FDO.Expressions
 {

Modified: trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoTerminalNames.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoTerminalNames.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoTerminalNames.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -19,11 +19,6 @@
 //
 
 #endregion Disclaimer / License
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.FDO.Expressions
 {

Modified: trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoUnaryLogicalOperator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoUnaryLogicalOperator.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoUnaryLogicalOperator.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,11 +20,6 @@
 
 #endregion Disclaimer / License
 using Irony.Parsing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.FDO.Expressions
 {

Modified: trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoValueExpression.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoValueExpression.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/FdoValueExpression.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,11 +20,6 @@
 
 #endregion Disclaimer / License
 using Irony.Parsing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.FDO.Expressions
 {

Modified: trunk/Tools/Maestro/OSGeo.FDO.Expressions/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.FDO.Expressions/Properties/AssemblyInfo.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/Properties/AssemblyInfo.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

Modified: trunk/Tools/Maestro/OSGeo.FDO.Expressions/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.FDO.Expressions/Strings.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.FDO.Expressions/Strings.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace OSGeo.FDO.Expressions {
-    using System;
-    
-    
+namespace OSGeo.FDO.Expressions
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/ExecuteLoadProcedure.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/ExecuteLoadProcedure.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/ExecuteLoadProcedure.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,7 +20,6 @@
 
 #endregion Disclaimer / License
 
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels;

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/IGetResourceContents.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/IGetResourceContents.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/IGetResourceContents.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,7 +20,6 @@
 
 #endregion Disclaimer / License
 
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System.Collections.Generic;
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/IGetTileProviders.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/IGetTileProviders.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Commands/IGetTileProviders.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,11 +20,6 @@
 
 #endregion Disclaimer / License
 using OSGeo.MapGuide.ObjectModels.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.MaestroAPI.Commands
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CredentialWriter.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CredentialWriter.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CredentialWriter.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using System;
 using System.Diagnostics;
 using System.IO;

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceMigrator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceMigrator.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceMigrator.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,7 +20,6 @@
 
 #endregion Disclaimer / License
 
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Resource.Conversion;
 using OSGeo.MapGuide.ObjectModels;
 using System.Collections.Generic;

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceRebaser.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceRebaser.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/CrossConnection/ResourceRebaser.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,7 +20,6 @@
 
 #endregion Disclaimer / License
 
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System.IO;
 using System.Xml;

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ExtensionMethods.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ExtensionMethods.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ExtensionMethods.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,17 +20,15 @@
 
 #endregion Disclaimer / License
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using OSGeo.MapGuide.MaestroAPI;
 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.MaestroAPI.Services;
+using System;
 using System.IO;
-using OSGeo.MapGuide.ObjectModels;
+using System.Text;
 
 namespace OSGeo.MapGuide.MaestroAPI
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Internal/FixedWKTReader.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Internal/FixedWKTReader.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Internal/FixedWKTReader.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 using GeoAPI.Geometries;
 using NetTopologySuite.Geometries;
-using NetTopologySuite.IO;
 using NetTopologySuite.Utilities;
 using RTools_NTS.Util;
 using System;

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace OSGeo.MapGuide.MaestroAPI.Properties {
-    using System;
-    
-    
+namespace OSGeo.MapGuide.MaestroAPI.Properties
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseWebLayoutValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseWebLayoutValidator.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/BaseWebLayoutValidator.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -4,8 +4,8 @@
 using OSGeo.MapGuide.ObjectModels.MapDefinition;
 using OSGeo.MapGuide.ObjectModels.WebLayout;
 using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Collections.Generic;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ResourceValidationContext.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ResourceValidationContext.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ResourceValidationContext.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,12 +21,9 @@
 #endregion Disclaimer / License
 
 using OSGeo.MapGuide.MaestroAPI.Schema;
-using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.ObjectModels.Capabilities;
 using OSGeo.MapGuide.ObjectModels.Common;
 using System.Collections.Generic;
-using System.Diagnostics;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ValidationResultSet.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ValidationResultSet.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Resource/Validation/ValidationResultSet.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,8 +22,8 @@
 
 using OSGeo.MapGuide.ObjectModels;
 using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Collections.Generic;
 
 namespace OSGeo.MapGuide.MaestroAPI.Resource.Validation
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/GdalRasterItem.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/GdalRasterItem.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/GdalRasterItem.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,7 +20,6 @@
 
 #endregion Disclaimer / License
 
-using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.Common;
 using System;

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/RasterWmsItem.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/RasterWmsItem.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/RasterWmsItem.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,7 +20,6 @@
 
 #endregion Disclaimer / License
 
-using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.ObjectModels.Common;
 using System;
 using System.Collections.Generic;

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/WmsLayerDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/WmsLayerDefinition.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/WmsLayerDefinition.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,7 +20,6 @@
 
 #endregion Disclaimer / License
 
-using OSGeo.MapGuide.MaestroAPI.Schema;
 using OSGeo.MapGuide.ObjectModels.Common;
 using System;
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IResourceService.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IResourceService.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Services/IResourceService.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,7 +20,6 @@
 
 #endregion Disclaimer / License
 
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System.IO;
 using ObjCommon = OSGeo.MapGuide.ObjectModels.Common;

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Strings.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Strings.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace OSGeo.MapGuide.MaestroAPI {
-    using System;
-    
-    
+namespace OSGeo.MapGuide.MaestroAPI
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Commands/HttpGetResourceContents.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Commands/HttpGetResourceContents.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Commands/HttpGetResourceContents.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using OSGeo.MapGuide.MaestroAPI.Commands;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels;
 using System.Collections.Generic;

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Files.Designer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Files.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Files.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace OSGeo.MapGuide.MaestroAPI.Http {
-    using System;
-    
-    
+namespace OSGeo.MapGuide.MaestroAPI.Http
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpResourcePreviewUrlGenerator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpResourcePreviewUrlGenerator.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/HttpResourcePreviewUrlGenerator.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,7 +20,6 @@
 
 #endregion Disclaimer / License
 
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.MaestroAPI.Resource.Preview;
 using OSGeo.MapGuide.ObjectModels;
 using OSGeo.MapGuide.ObjectModels.ApplicationDefinition;

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Strings.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Http/Strings.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace OSGeo.MapGuide.MaestroAPI.Http {
-    using System;
-    
-    
+namespace OSGeo.MapGuide.MaestroAPI.Http
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -27,7 +27,6 @@
 using OSGeo.MapGuide.MaestroAPI.Local.Commands;
 using OSGeo.MapGuide.MaestroAPI.Mapping;
 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;

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Commands/LocalGetResourceContents.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Commands/LocalGetResourceContents.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/Commands/LocalGetResourceContents.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,7 +21,6 @@
 #endregion Disclaimer / License
 
 using OSGeo.MapGuide.MaestroAPI.Commands;
-using OSGeo.MapGuide.MaestroAPI.Resource;
 using OSGeo.MapGuide.ObjectModels;
 using System;
 using System.Collections.Generic;

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeConnection.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeConnection.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeConnection.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -26,7 +26,6 @@
 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.Schema;
 using OSGeo.MapGuide.MaestroAPI.SchemaOverrides;
 using OSGeo.MapGuide.MaestroAPI.Services;

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/ApplicationDefinitionInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/ApplicationDefinitionInterfaces.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/ApplicationDefinitionInterfaces.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,13 +20,10 @@
 
 #endregion Disclaimer / License
 
-using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
 using System.Xml;
 
 namespace OSGeo.MapGuide.ObjectModels.ApplicationDefinition

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/v1_0_0/ApplicationDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/v1_0_0/ApplicationDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/v1_0_0/ApplicationDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,8 +23,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
-using System.Text;
 using System.Xml;
 using System.Xml.Serialization;
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/v1_0_0/ApplicationDefinitionInfoImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/v1_0_0/ApplicationDefinitionInfoImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ApplicationDefinition/v1_0_0/ApplicationDefinitionInfoImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,10 +20,8 @@
 
 #endregion Disclaimer / License
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/BaseSerializable.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/BaseSerializable.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/BaseSerializable.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,11 +20,7 @@
 
 #endregion Disclaimer / License
 
-using System;
-using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 namespace OSGeo.MapGuide.ObjectModels

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Capabilities/FdoCapabilities.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Capabilities/FdoCapabilities.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Capabilities/FdoCapabilities.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,10 +20,6 @@
 
 #endregion Disclaimer / License
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.Capabilities
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Capabilities/v1_0_0/FdoCapabilitiesImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Capabilities/v1_0_0/FdoCapabilitiesImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Capabilities/v1_0_0/FdoCapabilitiesImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,10 +20,7 @@
 
 #endregion Disclaimer / License
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 namespace OSGeo.MapGuide.ObjectModels.Capabilities.v1_0_0

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Capabilities/v1_1_0/FdoCapabilitiesImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Capabilities/v1_1_0/FdoCapabilitiesImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Capabilities/v1_1_0/FdoCapabilitiesImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,10 +20,7 @@
 
 #endregion Disclaimer / License
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 namespace OSGeo.MapGuide.ObjectModels.Capabilities.v1_1_0

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Check.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Check.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Check.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,9 +21,6 @@
 #endregion Disclaimer / License
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ExpressionDataType.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ExpressionDataType.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ExpressionDataType.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,11 +20,6 @@
 
 #endregion Disclaimer / License
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.ObjectModels.Common
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ExtendedDataType.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ExtendedDataType.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ExtendedDataType.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,13 +20,8 @@
 
 #endregion Disclaimer / License
 
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.ObjectModels.Common
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/Geometries.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/Geometries.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/Geometries.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,10 +20,6 @@
 
 #endregion Disclaimer / License
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.Common
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IEnvelope.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IEnvelope.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IEnvelope.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,10 +21,7 @@
 #endregion Disclaimer / License
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.Common
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IExpressionPropertySource.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IExpressionPropertySource.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IExpressionPropertySource.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,11 +20,6 @@
 
 #endregion Disclaimer / License
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.ObjectModels.Common
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IFdoSerializable.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IFdoSerializable.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IFdoSerializable.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,10 +20,6 @@
 
 #endregion Disclaimer / License
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Xml;
 
 namespace OSGeo.MapGuide.ObjectModels.Common

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IFdoSpatialContext.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IFdoSpatialContext.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IFdoSpatialContext.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,10 +21,7 @@
 #endregion Disclaimer / License
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 namespace OSGeo.MapGuide.ObjectModels.Common

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ILongTransaction.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ILongTransaction.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ILongTransaction.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,10 +20,7 @@
 
 #endregion Disclaimer / License
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.Common
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IRepositoryItem.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IRepositoryItem.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IRepositoryItem.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,9 +21,6 @@
 #endregion Disclaimer / License
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.Common
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IResourceIdReference.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IResourceIdReference.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/IResourceIdReference.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,12 +20,7 @@
 
 #endregion Disclaimer / License
 
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.ObjectModels.Common
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ResourceItems.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ResourceItems.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ResourceItems.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,10 +20,7 @@
 
 #endregion Disclaimer / License
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 namespace OSGeo.MapGuide.ObjectModels.Common

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ResourceList.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ResourceList.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ResourceList.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,11 +20,7 @@
 
 #endregion Disclaimer / License
 
-using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 namespace OSGeo.MapGuide.ObjectModels.Common

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ResourcePackageManifest.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ResourcePackageManifest.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/ResourcePackageManifest.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,10 +20,6 @@
 
 #endregion Disclaimer / License
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.Common
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/TileProviderList.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/TileProviderList.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/TileProviderList.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -19,11 +19,6 @@
 //
 
 #endregion Disclaimer / License
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.ObjectModels.Common
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/UnmanagedDataList.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/UnmanagedDataList.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Common/UnmanagedDataList.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,10 +20,6 @@
 
 #endregion Disclaimer / License
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 namespace OSGeo.MapGuide.ObjectModels.Common

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/DrawingSource/DrawingSourceInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/DrawingSource/DrawingSourceInterfaces.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/DrawingSource/DrawingSourceInterfaces.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,10 +21,7 @@
 #endregion Disclaimer / License
 
 using OSGeo.MapGuide.ObjectModels.Common;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.DrawingSource
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/DrawingSource/v1_0_0/DrawingSourceImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/DrawingSource/v1_0_0/DrawingSourceImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/DrawingSource/v1_0_0/DrawingSourceImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,11 +21,8 @@
 #endregion Disclaimer / License
 
 using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels.DrawingSource;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/FeatureSourceInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/FeatureSourceInterfaces.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/FeatureSourceInterfaces.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,12 +21,9 @@
 #endregion Disclaimer / License
 
 using OSGeo.MapGuide.ObjectModels.FeatureSource.v1_0_0;
-using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.FeatureSource
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/v1_0_0/FeatureSourceImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/v1_0_0/FeatureSourceImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/FeatureSource/v1_0_0/FeatureSourceImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,8 +23,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 namespace OSGeo.MapGuide.ObjectModels.FeatureSource.v1_0_0

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/IO/ReadOnlyRewindableStream.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/IO/ReadOnlyRewindableStream.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/IO/ReadOnlyRewindableStream.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,10 +21,7 @@
 #endregion Disclaimer / License
 
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.IO
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/IO/Utf8XmlWriter.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/IO/Utf8XmlWriter.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/IO/Utf8XmlWriter.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,10 +20,6 @@
 
 #endregion Disclaimer / License
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.IO
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/IResource.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/IResource.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/IResource.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,10 +21,8 @@
 #endregion Disclaimer / License
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
-using System.Linq;
 using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/IVersionedEntity.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/IVersionedEntity.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/IVersionedEntity.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,9 +21,6 @@
 #endregion Disclaimer / License
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/LayerDefinitionInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/LayerDefinitionInterfaces.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/LayerDefinitionInterfaces.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -27,8 +27,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.LayerDefinition
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0/GridLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0/GridLayerDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0/GridLayerDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,11 +23,6 @@
 #define LDF_100
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Xml;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0/LayerElementFactoryImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0/LayerElementFactoryImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0/LayerElementFactoryImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,11 +23,8 @@
 #define LDF_100
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-using System.Linq;
-using System.Text;
 
 #pragma warning disable 1591, 0114, 0108
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0/VectorLayerDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_0_0/VectorLayerDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,11 +24,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 using System.Xml;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0/GridLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0/GridLayerDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0/GridLayerDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,17 +23,12 @@
 #define LDF_110
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Xml;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108
 
 namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_1_0
-{    
+{
     partial class GridLayerDefinitionType : IRasterLayerDefinition
     {
         [XmlIgnore]

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0/LayerElementFactoryImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0/LayerElementFactoryImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0/LayerElementFactoryImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,11 +23,8 @@
 #define LDF_110
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-using System.Linq;
-using System.Text;
 
 #pragma warning disable 1591, 0114, 0108
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0/VectorLayerDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_1_0/VectorLayerDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,20 +21,17 @@
 #endregion Disclaimer / License
 
 #define LDF_110
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 using System.Xml;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108
 
 namespace OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_1_0
-{    
+{
     abstract partial class BaseLayerDefinitionType : ISubLayerDefinition
     {
         [XmlIgnore]

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0/GridLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0/GridLayerDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0/GridLayerDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,10 +23,6 @@
 #define LDF_120
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Xml;
 
 #pragma warning disable 1591, 0114, 0108
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0/LayerElementFactoryImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0/LayerElementFactoryImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0/LayerElementFactoryImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,11 +23,8 @@
 #define LDF_120
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-using System.Linq;
-using System.Text;
 
 #pragma warning disable 1591, 0114, 0108
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0/VectorLayerDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_2_0/VectorLayerDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,8 +24,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 using System.Xml;
 
 #pragma warning disable 1591, 0114, 0108

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0/GridLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0/GridLayerDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0/GridLayerDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,10 +23,6 @@
 #define LDF_130
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Xml;
 
 #pragma warning disable 1591, 0114, 0108
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0/LayerElementFactoryImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0/LayerElementFactoryImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0/LayerElementFactoryImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,11 +23,8 @@
 #define LDF_130
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-using System.Linq;
-using System.Text;
 
 #pragma warning disable 1591, 0114, 0108
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0/VectorLayerDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v1_3_0/VectorLayerDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,8 +24,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 using System.Xml;
 
 #pragma warning disable 1591, 0114, 0108

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0/GridLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0/GridLayerDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0/GridLayerDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,10 +23,6 @@
 #define LDF_230
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Xml;
 
 #pragma warning disable 1591, 0114, 0108
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0/LayerElementFactoryImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0/LayerElementFactoryImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0/LayerElementFactoryImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,11 +23,8 @@
 #define LDF_230
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-using System.Linq;
-using System.Text;
 
 #pragma warning disable 1591, 0114, 0108
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0/VectorLayerDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_3_0/VectorLayerDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,8 +24,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 using System.Xml;
 
 #pragma warning disable 1591, 0114, 0108

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0/GridLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0/GridLayerDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0/GridLayerDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,10 +23,6 @@
 #define LDF_240
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Xml;
 
 #pragma warning disable 1591, 0114, 0108
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0/LayerElementFactoryImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0/LayerElementFactoryImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0/LayerElementFactoryImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,12 +22,8 @@
 
 #define LDF_240
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-using System.Linq;
-using System.Text;
 
 #pragma warning disable 1591, 0114, 0108
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0/VectorLayerDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LayerDefinition/v2_4_0/VectorLayerDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,8 +24,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 using System.Xml;
 
 #pragma warning disable 1591, 0114, 0108

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/LoadProcedureInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/LoadProcedureInterfaces.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/LoadProcedureInterfaces.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,8 +23,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.LoadProcedure
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_0_0/LoadProcedureFactoryImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_0_0/LoadProcedureFactoryImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_0_0/LoadProcedureFactoryImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,11 +21,7 @@
 #endregion Disclaimer / License
 
 #define LP100
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
 
 #pragma warning disable 1591, 0114, 0108
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_0_0/LoadProcedureImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_0_0/LoadProcedureImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_0_0/LoadProcedureImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,8 +23,6 @@
 #define LP100
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0/LoadProcedureFactoryImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0/LoadProcedureFactoryImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0/LoadProcedureFactoryImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,11 +21,7 @@
 #endregion Disclaimer / License
 
 #define LP110
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
 
 #pragma warning disable 1591, 0114, 0108
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0/LoadProcedureImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0/LoadProcedureImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v1_1_0/LoadProcedureImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,8 +22,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v2_4_0/LoadProcedureFactoryImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v2_4_0/LoadProcedureFactoryImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v2_4_0/LoadProcedureFactoryImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,11 +21,7 @@
 #endregion Disclaimer / License
 
 #define LP220
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
 
 #pragma warning disable 1591, 0114, 0108
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v2_4_0/LoadProcedureImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v2_4_0/LoadProcedureImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/LoadProcedure/v2_4_0/LoadProcedureImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,8 +23,6 @@
 #define LP220
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/MapDefinitionInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/MapDefinitionInterfaces.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/MapDefinitionInterfaces.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -28,8 +28,6 @@
 using System.ComponentModel;
 using System.Drawing;
 using System.Linq;
-using System.Text;
-using OSGeo.MapGuide.ObjectModels;
 
 namespace OSGeo.MapGuide.ObjectModels.MapDefinition
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v1_0_0/MapDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v1_0_0/MapDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v1_0_0/MapDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 #define MDF_100
 using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using OSGeo.MapGuide.ObjectModels.TileSetDefinition;
 using System;
 using System.Collections.Generic;
@@ -30,7 +29,6 @@
 using System.Drawing;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_3_0/MapDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_3_0/MapDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_3_0/MapDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 #define MDF_230
 using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using OSGeo.MapGuide.ObjectModels.TileSetDefinition;
 using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 using System;
@@ -31,7 +30,6 @@
 using System.Drawing;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_4_0/MapDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_4_0/MapDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v2_4_0/MapDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 #define MDF_240
 using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using OSGeo.MapGuide.ObjectModels.TileSetDefinition;
 using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 using System;
@@ -31,7 +30,6 @@
 using System.Drawing;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0/MapDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0/MapDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0/MapDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,7 +22,6 @@
 
 #define MDF_240
 using OSGeo.MapGuide.ObjectModels.Common;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
 using OSGeo.MapGuide.ObjectModels.TileSetDefinition;
 using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
 using System;
@@ -31,7 +30,6 @@
 using System.Drawing;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ObjectFactory.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ObjectFactory.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ObjectFactory.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -38,8 +38,6 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.IO;
-using System.Linq;
-using System.Text;
 using Ldf110 = OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_1_0;
 using Ldf120 = OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_2_0;
 using Ldf130 = OSGeo.MapGuide.ObjectModels.LayerDefinition.v1_3_0;
@@ -52,12 +50,12 @@
 using Mdf300 = OSGeo.MapGuide.ObjectModels.MapDefinition.v3_0_0;
 using Sym110 = OSGeo.MapGuide.ObjectModels.SymbolDefinition.v1_1_0;
 using Sym240 = OSGeo.MapGuide.ObjectModels.SymbolDefinition.v2_4_0;
+using Tsd300 = OSGeo.MapGuide.ObjectModels.TileSetDefinition.v3_0_0;
 using Wdf230 = OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_3_0;
 using Wdf240 = OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_4_0;
 using WL110 = OSGeo.MapGuide.ObjectModels.WebLayout.v1_1_0;
 using WL240 = OSGeo.MapGuide.ObjectModels.WebLayout.v2_4_0;
 using WL260 = OSGeo.MapGuide.ObjectModels.WebLayout.v2_6_0;
-using Tsd300 = OSGeo.MapGuide.ObjectModels.TileSetDefinition.v3_0_0;
 
 namespace OSGeo.MapGuide.ObjectModels
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/PrintLayout/PrintLayoutInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/PrintLayout/PrintLayoutInterfaces.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/PrintLayout/PrintLayoutInterfaces.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,12 +20,9 @@
 
 #endregion Disclaimer / License
 
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.PrintLayout
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/PrintLayout/v1.0.0/PrintLayoutImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/PrintLayout/v1.0.0/PrintLayoutImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/PrintLayout/v1.0.0/PrintLayoutImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,8 +22,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Properties/AssemblyInfo.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Properties/AssemblyInfo.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Properties/AssemblyInfo.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceContentVersionChecker.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceContentVersionChecker.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceContentVersionChecker.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,9 +21,7 @@
 #endregion Disclaimer / License
 
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
 using System.Xml;

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceIdentifier.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceIdentifier.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceIdentifier.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,9 +21,6 @@
 #endregion Disclaimer / License
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypeDescriptor.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypeDescriptor.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypeDescriptor.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,10 +20,6 @@
 
 #endregion Disclaimer / License
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypeRegistry.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypeRegistry.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypeRegistry.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,9 +24,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
 using System.Xml;
 
 namespace OSGeo.MapGuide.ObjectModels

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypes.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypes.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/ResourceTypes.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,10 +20,6 @@
 
 #endregion Disclaimer / License
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/RuntimeMap/RuntimeMapInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/RuntimeMap/RuntimeMapInterfaces.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/RuntimeMap/RuntimeMapInterfaces.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,10 +21,7 @@
 #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
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/RuntimeMap/v2_6_0/RuntimeMapImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/RuntimeMap/v2_6_0/RuntimeMapImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/RuntimeMap/v2_6_0/RuntimeMapImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,7 +24,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.RuntimeMap.v2_6_0
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/RuntimeMap/v3_0_0/RuntimeMapImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/RuntimeMap/v3_0_0/RuntimeMapImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/RuntimeMap/v3_0_0/RuntimeMapImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -25,7 +25,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.RuntimeMap.v3_0_0
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Strings.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Strings.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace OSGeo.MapGuide.ObjectModels {
-    using System;
-    
-    
+namespace OSGeo.MapGuide.ObjectModels
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/SymbolDefinitionInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/SymbolDefinitionInterfaces.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/SymbolDefinitionInterfaces.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -25,7 +25,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_0_0/SymbolDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_0_0/SymbolDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_0_0/SymbolDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -25,9 +25,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
 using System.Xml;
 using System.Xml.Serialization;
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_1_0/SymbolDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_1_0/SymbolDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v1_1_0/SymbolDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -26,9 +26,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
 using System.Xml;
 using System.Xml.Serialization;
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v2_4_0/SymbolDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v2_4_0/SymbolDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolDefinition/v2_4_0/SymbolDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -26,9 +26,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
 using System.Xml;
 using System.Xml.Serialization;
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolLibrary/SymbolLibraryInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolLibrary/SymbolLibraryInterfaces.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolLibrary/SymbolLibraryInterfaces.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,10 +20,7 @@
 
 #endregion Disclaimer / License
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.SymbolLibrary
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolLibrary/v1.0.0/SymbolLibraryImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolLibrary/v1.0.0/SymbolLibraryImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/SymbolLibrary/v1.0.0/SymbolLibraryImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -22,8 +22,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/TileSetDefinition/TileSetInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/TileSetDefinition/TileSetInterfaces.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/TileSetDefinition/TileSetInterfaces.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -27,7 +27,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.TileSetDefinition
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/TileSetDefinition/v3_0_0/TileSetImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/TileSetDefinition/v3_0_0/TileSetImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/TileSetDefinition/v3_0_0/TileSetImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -27,7 +27,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 namespace OSGeo.MapGuide.ObjectModels.TileSetDefinition.v3_0_0

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/UntypedResource.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/UntypedResource.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/UntypedResource.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -21,9 +21,6 @@
 #endregion Disclaimer / License
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 #pragma warning disable 1591, 0114, 0108
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Utility.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Utility.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/Utility.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -26,8 +26,6 @@
 using System.Collections.Specialized;
 using System.Drawing;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Xml;
 using System.Xml.Serialization;
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/WatermarkCollectionUtil.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/WatermarkCollectionUtil.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/WatermarkCollectionUtil.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,10 +20,7 @@
 
 #endregion Disclaimer / License
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.WatermarkDefinition
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/WatermarkDefinitionInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/WatermarkDefinitionInterfaces.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/WatermarkDefinitionInterfaces.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,8 +24,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.WatermarkDefinition
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_3_0/WatermarkDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_3_0/WatermarkDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_3_0/WatermarkDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,10 +24,7 @@
 
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 #if WDF_240

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_4_0/WatermarkDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_4_0/WatermarkDefinitionImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WatermarkDefinition/v2_4_0/WatermarkDefinitionImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -24,10 +24,7 @@
 
 using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 #if WDF_240

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/WebLayoutInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/WebLayoutInterfaces.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/WebLayoutInterfaces.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -23,8 +23,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels.WebLayout
 {

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_0_0/WebLayoutImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_0_0/WebLayoutImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_0_0/WebLayoutImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -25,8 +25,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_1_0/WebLayoutImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_1_0/WebLayoutImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v1_1_0/WebLayoutImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -25,8 +25,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_4_0/WebLayoutImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_4_0/WebLayoutImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_4_0/WebLayoutImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -25,8 +25,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_6_0/WebLayoutImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_6_0/WebLayoutImpl.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/WebLayout/v2_6_0/WebLayoutImpl.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -25,8 +25,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Xml.Serialization;
 
 #pragma warning disable 1591, 0114, 0108

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/XmlNamespaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/XmlNamespaces.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/XmlNamespaces.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -20,10 +20,6 @@
 
 #endregion Disclaimer / License
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OSGeo.MapGuide.ObjectModels
 {

Modified: trunk/Tools/Maestro/ProviderTemplate/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/ProviderTemplate/Properties/Resources.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/ProviderTemplate/Properties/Resources.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace ProviderTemplate.Properties {
-    using System;
-    
-    
+namespace ProviderTemplate.Properties
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/RtMapInspector/MainForm.cs
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/MainForm.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/RtMapInspector/MainForm.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -26,10 +26,9 @@
 using OSGeo.MapGuide.MaestroAPI.Services;
 using OSGeo.MapGuide.ObjectModels.Common;
 using System;
-using System.Linq;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
+using System.Linq;
 using System.Windows.Forms;
 
 namespace RtMapInspector

Modified: trunk/Tools/Maestro/RtMapInspector/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/Properties/Resources.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/RtMapInspector/Properties/Resources.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace RtMapInspector.Properties {
-    using System;
-    
-    
+namespace RtMapInspector.Properties
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>

Modified: trunk/Tools/Maestro/RtMapInspector/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/RtMapInspector/Strings.Designer.cs	2015-08-18 17:04:11 UTC (rev 8751)
+++ trunk/Tools/Maestro/RtMapInspector/Strings.Designer.cs	2015-08-18 17:39:17 UTC (rev 8752)
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace RtMapInspector {
-    using System;
-    
-    
+namespace RtMapInspector
+{
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>



More information about the mapguide-commits mailing list