[mapguide-commits] r5987 - in trunk/Tools/Maestro: Doc
Maestro.Editors Maestro.Editors/Common
Maestro.Editors/Diagnostics Maestro.Editors/FeatureSource
Maestro.Editors/FeatureSource/Providers/Odbc
Maestro.Editors/FeatureSource/Providers/Odbc/Drivers
Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors
Maestro.Editors/FeatureSource/Providers/Wms
Maestro.Editors/Fusion Maestro.Editors/Fusion/WidgetEditors
Maestro.Editors/LayerDefinition
Maestro.Editors/LayerDefinition/Vector
Maestro.Editors/LayerDefinition/Vector/Scales
Maestro.Editors/LayerDefinition/Vector/StyleEditors
Maestro.Editors/LoadProcedure Maestro.Editors/PrintLayout
Maestro.Editors/SymbolDefinition
Maestro.Editors/SymbolDefinition/GraphicsEditors
Maestro.Editors/WatermarkDefinition MaestroAPITestRunner
OSGeo.MapGuide.MaestroAPI OSGeo.MapGuide.MaestroAPI/ObjectModels
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Jul 12 08:50:15 EDT 2011
Author: jng
Date: 2011-07-12 05:50:15 -0700 (Tue, 12 Jul 2011)
New Revision: 5987
Modified:
trunk/Tools/Maestro/Doc/MaestroAPI.shfbproj
trunk/Tools/Maestro/Maestro.Editors/Common/GenericInputDialog.cs
trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Diagnostics/FdoCacheViewer.cs
trunk/Tools/Maestro/Maestro.Editors/EditorBase.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/ExtensionsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/OracleDriver.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/OracleMsDriver.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/SqlServerDriver.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcDriverInfo.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcDriverMap.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ManagedCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/RasterDefinitionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/SpatialContextsDialog.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditorContext.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/FusionWidgetEditorMap.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditorFactory.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/IWidgetEditor.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetEditorBase.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/RasterLayerEditorCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.resx
trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/LoadProcedureEditorCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/PrintLayout/TextDialog.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/AdvancedSettingsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/CompoundSymbolDefinitionEditorCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GeneralSettingsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParameterSelector.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParametersCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionDialog.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionEditorCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolField.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolGraphicsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterDialog.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterEditor.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/UsageContextsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/TilePositionEditor.cs
trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkContentCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkEditorCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditorDialog.cs
trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkSettingsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/XYPositionEditor.cs
trunk/Tools/Maestro/MaestroAPITestRunner/App.config
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/IServerConnection.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcedureInterfaces.cs
Log:
Assorted API commentary and localization updates
Modified: trunk/Tools/Maestro/Doc/MaestroAPI.shfbproj
===================================================================
--- trunk/Tools/Maestro/Doc/MaestroAPI.shfbproj 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Doc/MaestroAPI.shfbproj 2011-07-12 12:50:15 UTC (rev 5987)
@@ -24,34 +24,37 @@
<SandcastlePath>
</SandcastlePath>
<DocumentationSources>
- <DocumentationSource sourceFile="..\SDK\bin\OSGeo.MapGuide.MaestroAPI.dll" />
- <DocumentationSource sourceFile="..\SDK\bin\OSGeo.MapGuide.MaestroAPI.xml" />
- <DocumentationSource sourceFile="..\SDK\bin\Maestro.Packaging.dll" />
- <DocumentationSource sourceFile="..\SDK\bin\Maestro.Packaging.xml" />
<DocumentationSource sourceFile="..\SDK\bin\Maestro.Editors.dll" />
<DocumentationSource sourceFile="..\SDK\bin\Maestro.Editors.xml" />
<DocumentationSource sourceFile="..\SDK\bin\Maestro.Login.dll" />
<DocumentationSource sourceFile="..\SDK\bin\Maestro.Login.xml" />
+ <DocumentationSource sourceFile="..\SDK\bin\Maestro.Packaging.dll" />
+ <DocumentationSource sourceFile="..\SDK\bin\Maestro.Packaging.xml" />
<DocumentationSource sourceFile="..\SDK\bin\Maestro.Shared.UI.dll" />
<DocumentationSource sourceFile="..\SDK\bin\Maestro.Shared.UI.xml" />
+ <DocumentationSource sourceFile="..\SDK\bin\OSGeo.MapGuide.ExtendedObjectModels.dll" />
+ <DocumentationSource sourceFile="..\SDK\bin\OSGeo.MapGuide.ExtendedObjectModels.xml" />
+ <DocumentationSource sourceFile="..\SDK\bin\OSGeo.MapGuide.MaestroAPI.dll" />
+ <DocumentationSource sourceFile="..\SDK\bin\OSGeo.MapGuide.MaestroAPI.xml" />
</DocumentationSources>
<VisibleItems>Attributes, InheritedMembers, Protected, SealedProtected</VisibleItems>
<ApiFilter>
<Filter entryType="Namespace" fullName="Maestro.Editors.FeatureSource.Preview" isExposed="False" />
-<Filter entryType="Namespace" fullName="Maestro.Editors.FeatureSource.Providers.Odbc" isExposed="False" />
-<Filter entryType="Namespace" fullName="Maestro.Editors.FeatureSource.Providers.Odbc.Drivers" isExposed="False" />
-<Filter entryType="Namespace" fullName="Maestro.Editors.FeatureSource.Providers.Wms" isExposed="False" />
-<Filter entryType="Namespace" fullName="OSGeo.MapGuide.ObjectModels.ApplicationDefinition_1_0_0" isExposed="False" />
-<Filter entryType="Namespace" fullName="OSGeo.MapGuide.ObjectModels.DrawingSource_1_0_0" isExposed="False" />
-<Filter entryType="Namespace" fullName="OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0" isExposed="False" />
-<Filter entryType="Namespace" fullName="OSGeo.MapGuide.ObjectModels.LayerDefinition_1_0_0" isExposed="False" />
-<Filter entryType="Namespace" fullName="OSGeo.MapGuide.ObjectModels.LoadProcedure_1_0_0" isExposed="False" />
-<Filter entryType="Namespace" fullName="OSGeo.MapGuide.ObjectModels.MapDefinition_1_0_0" isExposed="False" />
-<Filter entryType="Namespace" fullName="OSGeo.MapGuide.ObjectModels.PrintLayout_1_0_0" isExposed="False" />
-<Filter entryType="Namespace" fullName="OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0" isExposed="False" />
-<Filter entryType="Namespace" fullName="OSGeo.MapGuide.ObjectModels.SymbolLibrary_1_0_0" isExposed="False" />
-<Filter entryType="Namespace" fullName="OSGeo.MapGuide.ObjectModels.WebLayout_1_0_0" isExposed="False" />
-<Filter entryType="Namespace" fullName="System.Runtime.CompilerServices" isExposed="False" /></ApiFilter>
+ <Filter entryType="Namespace" fullName="Maestro.Editors.FeatureSource.Providers.Odbc" isExposed="False" />
+ <Filter entryType="Namespace" fullName="Maestro.Editors.FeatureSource.Providers.Odbc.Drivers" isExposed="False" />
+ <Filter entryType="Namespace" fullName="Maestro.Editors.FeatureSource.Providers.Wms" isExposed="False" />
+ <Filter entryType="Namespace" fullName="OSGeo.MapGuide.ObjectModels.ApplicationDefinition_1_0_0" isExposed="False" />
+ <Filter entryType="Namespace" fullName="OSGeo.MapGuide.ObjectModels.DrawingSource_1_0_0" isExposed="False" />
+ <Filter entryType="Namespace" fullName="OSGeo.MapGuide.ObjectModels.FeatureSource_1_0_0" isExposed="False" />
+ <Filter entryType="Namespace" fullName="OSGeo.MapGuide.ObjectModels.LayerDefinition_1_0_0" isExposed="False" />
+ <Filter entryType="Namespace" fullName="OSGeo.MapGuide.ObjectModels.LoadProcedure_1_0_0" isExposed="False" />
+ <Filter entryType="Namespace" fullName="OSGeo.MapGuide.ObjectModels.MapDefinition_1_0_0" isExposed="False" />
+ <Filter entryType="Namespace" fullName="OSGeo.MapGuide.ObjectModels.PrintLayout_1_0_0" isExposed="False" />
+ <Filter entryType="Namespace" fullName="OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0" isExposed="False" />
+ <Filter entryType="Namespace" fullName="OSGeo.MapGuide.ObjectModels.SymbolLibrary_1_0_0" isExposed="False" />
+ <Filter entryType="Namespace" fullName="OSGeo.MapGuide.ObjectModels.WebLayout_1_0_0" isExposed="False" />
+ <Filter entryType="Namespace" fullName="System.Runtime.CompilerServices" isExposed="False" />
+ </ApiFilter>
<SdkLinkType>None</SdkLinkType>
<FeedbackEMailAddress>jumpinjackie at gmail.com</FeedbackEMailAddress>
<WebsiteSdkLinkType>None</WebsiteSdkLinkType>
@@ -63,6 +66,21 @@
<RootNamespaceContainer>True</RootNamespaceContainer>
<Preliminary>False</Preliminary>
<MissingTags>Summary, Parameter, Returns, AutoDocumentCtors, Namespace, TypeParameter, AutoDocumentDispose</MissingTags>
+ <ProjectSummary>&lt%3bsummary&gt%3b
+This is the reference documentation for the MapGuide Maestro API. The API consists of:
+
+&lt%3blist type=&quot%3bbullet&quot%3b&gt%3b
+ &lt%3bitem&gt%3b&lt%3bdescription&gt%3bThe Maestro API core %28OSGeo.MapGuide.MaestroAPI.dll%29&lt%3b/description&gt%3b&lt%3b/item&gt%3b
+ &lt%3bitem&gt%3b&lt%3bdescription&gt%3bThe Maestro Extended Object Model Helper %28OSGeo.MapGuide.ExtendedObjectModels.dll%29&lt%3b/description&gt%3b&lt%3b/item&gt%3b
+ &lt%3bitem&gt%3b&lt%3bdescription&gt%3bThe Maestro Editor UI library %28Maestro.Editors.dll%29&lt%3b/description&gt%3b&lt%3b/item&gt%3b
+ &lt%3bitem&gt%3b&lt%3bdescription&gt%3bThe Maestro Packaging library %28Maestro.Packaging.dll%29&lt%3b/description&gt%3b&lt%3b/item&gt%3b
+ &lt%3bitem&gt%3b&lt%3bdescription&gt%3bThe Maestro Login UI library %28Maestro.Login.dll%29&lt%3b/description&gt%3b&lt%3b/item&gt%3b
+ &lt%3bitem&gt%3b&lt%3bdescription&gt%3bThe Maestro Shared UI library %28Maestro.Shared.UI.dll%29&lt%3b/description&gt%3b&lt%3b/item&gt%3b
+&lt%3b/list&gt%3b
+
+Public classes, interfaces and types defined within these libraries are covered in this document.
+&lt%3b/summary&gt%3b</ProjectSummary>
+ <RootNamespaceTitle>MapGuide Maestro API Documentation</RootNamespaceTitle>
</PropertyGroup>
<!-- There are no properties for these groups. AnyCPU needs to appear in
order for Visual Studio to perform the build. The others are optional
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/GenericInputDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/GenericInputDialog.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/GenericInputDialog.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -27,6 +27,9 @@
namespace Maestro.Editors.Common
{
+ /// <summary>
+ /// A simple generic dialog to capture user input
+ /// </summary>
public partial class GenericInputDialog : Form
{
public GenericInputDialog()
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -141,8 +141,16 @@
BindResourceList();
}
+ /// <summary>
+ /// A event handler for uploaded resources
+ /// </summary>
+ /// <param name="dataName"></param>
+ /// <param name="origPath"></param>
public delegate void ResourceUploadEventHandler(string dataName, string origPath);
+ /// <summary>
+ /// Raised when a data file has been uploaded as resource data
+ /// </summary>
public event ResourceUploadEventHandler ResourceDataUploaded;
private void btnAdd_Click(object sender, EventArgs e)
Modified: trunk/Tools/Maestro/Maestro.Editors/Diagnostics/FdoCacheViewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Diagnostics/FdoCacheViewer.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/Diagnostics/FdoCacheViewer.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -29,10 +29,17 @@
namespace Maestro.Editors.Diagnostics
{
+ /// <summary>
+ /// Provides a simple user interface to display the results of a <see cref="T:OSGeo.MapGuide.MaestroAPI.Commands.IGetFdoCacheInfo"/> command
+ /// </summary>
public partial class FdoCacheViewer : Form
{
private IGetFdoCacheInfo _cmd;
+ /// <summary>
+ /// Constructor
+ /// </summary>
+ /// <param name="cache"></param>
public FdoCacheViewer(IGetFdoCacheInfo cache)
{
InitializeComponent();
Modified: trunk/Tools/Maestro/Maestro.Editors/EditorBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/EditorBase.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/EditorBase.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -26,10 +26,10 @@
namespace Maestro.Editors
{
- [ToolboxItem(false)]
/// <summary>
/// Base class of all resource editors
/// </summary>
+ [ToolboxItem(false)]
public class EditorBase : UserControl, IEditorBindable
{
/// <summary>
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/ExtensionsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/ExtensionsCtrl.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/ExtensionsCtrl.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -30,7 +30,6 @@
using Maestro.Shared.UI;
using OSGeo.MapGuide.MaestroAPI;
using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.ObjectModels;
using OSGeo.MapGuide.ObjectModels.FeatureSource;
using OSGeo.MapGuide.MaestroAPI.Schema;
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/OracleDriver.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/OracleDriver.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/OracleDriver.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -23,8 +23,14 @@
namespace Maestro.Editors.FeatureSource.Providers.Odbc.Drivers
{
+ /// <summary>
+ /// Oracle ODBC connection string builder
+ /// </summary>
public class OracleDriver : OdbcDriverInfo
{
+ /// <summary>
+ /// Gets the built connection string
+ /// </summary>
public override string OdbcConnectionString
{
get
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/OracleMsDriver.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/OracleMsDriver.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/OracleMsDriver.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -23,8 +23,14 @@
namespace Maestro.Editors.FeatureSource.Providers.Odbc.Drivers
{
+ /// <summary>
+ /// Oracle odbc connection string builder
+ /// </summary>
public class OracleMsDriver : OdbcDriverInfo
{
+ /// <summary>
+ /// Gets the built connection string
+ /// </summary>
public override string OdbcConnectionString
{
get
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/SqlServerDriver.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/SqlServerDriver.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/Drivers/SqlServerDriver.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -24,20 +24,38 @@
namespace Maestro.Editors.FeatureSource.Providers.Odbc.Drivers
{
+ /// <summary>
+ /// SQL Server ODBC connection string builder
+ /// </summary>
public class SqlServerDriver : OdbcDriverInfo
{
+ /// <summary>
+ /// The SQL Server Name
+ /// </summary>
[Description("The SQL Server Name")]
public string ServerName { get; set; }
+ /// <summary>
+ /// The SQL Server database
+ /// </summary>
[Description("The SQL Server database")]
public string Database { get; set; }
+ /// <summary>
+ /// The user name
+ /// </summary>
[Description("Username")]
public string UserName { get; set; }
+ /// <summary>
+ /// The password
+ /// </summary>
[Description("Password")]
public string Password { get; set; }
+ /// <summary>
+ /// Gets the built connection string
+ /// </summary>
public override string OdbcConnectionString
{
get
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcDriverInfo.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcDriverInfo.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcDriverInfo.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -23,8 +23,14 @@
namespace Maestro.Editors.FeatureSource.Providers.Odbc
{
+ /// <summary>
+ /// The base class of all ODBC connection string builders
+ /// </summary>
public abstract class OdbcDriverInfo
{
+ /// <summary>
+ /// Gets the built connection string
+ /// </summary>
public abstract string OdbcConnectionString { get; set; }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcDriverMap.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcDriverMap.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcDriverMap.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -73,6 +73,9 @@
}
}
+ /// <summary>
+ /// Thrown when an ODBC driver is not found
+ /// </summary>
[global::System.Serializable]
public class OdbcDriverNotFoundException : Exception
{
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ManagedCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ManagedCtrl.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ManagedCtrl.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -125,7 +125,5 @@
{
get { return this; }
}
-
- public event EventHandler ResourceChanged;
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/RasterDefinitionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/RasterDefinitionCtrl.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/RasterDefinitionCtrl.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -31,7 +31,7 @@
namespace Maestro.Editors.FeatureSource.Providers.Wms
{
[ToolboxItem(false)]
- public partial class RasterDefinitionCtrl : UserControl
+ internal partial class RasterDefinitionCtrl : UserControl
{
private WmsConfigurationDocument _config;
private RasterWmsItem _item;
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsAdvancedConfigurationDialog.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -32,7 +32,7 @@
namespace Maestro.Editors.FeatureSource.Providers.Wms
{
- public partial class WmsAdvancedConfigurationDialog : Form
+ internal partial class WmsAdvancedConfigurationDialog : Form
{
private IEditorService _service;
private WmsConfigurationDocument _config;
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -31,7 +31,7 @@
namespace Maestro.Editors.FeatureSource.Providers.Wms
{
[ToolboxItem(false)]
- public partial class WmsProviderCtrl : EditorBindableCollapsiblePanel
+ internal partial class WmsProviderCtrl : EditorBindableCollapsiblePanel
{
public WmsProviderCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/SpatialContextsDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/SpatialContextsDialog.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/SpatialContextsDialog.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -30,6 +30,9 @@
namespace Maestro.Editors.FeatureSource
{
+ /// <summary>
+ /// A dialog that displays the spatial contexts of a feature source
+ /// </summary>
public partial class SpatialContextsDialog : Form
{
private SpatialContextsDialog()
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditorContext.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditorContext.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexibleLayoutEditorContext.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -26,6 +26,9 @@
namespace Maestro.Editors.Fusion
{
+ /// <summary>
+ /// A helper class for widget editors
+ /// </summary>
public class FlexibleLayoutEditorContext
{
private IFusionService _service;
@@ -34,6 +37,10 @@
private IApplicationDefinitionTemplateInfoSet _templateSet;
private IApplicationDefinitionContainerInfoSet _containerSet;
+ /// <summary>
+ /// Constructor
+ /// </summary>
+ /// <param name="service"></param>
public FlexibleLayoutEditorContext(IFusionService service)
{
_service = service;
@@ -43,6 +50,11 @@
_containerSet = _service.GetApplicationContainers();
}
+ /// <summary>
+ /// Gets information about a particular widget (by name)
+ /// </summary>
+ /// <param name="name"></param>
+ /// <returns></returns>
public IWidgetInfo GetWidgetInfo(string name)
{
Check.NotEmpty(name, "name");
@@ -54,11 +66,20 @@
return null;
}
+ /// <summary>
+ /// Gets information about all widgets
+ /// </summary>
+ /// <returns></returns>
public IWidgetInfo[] GetAllWidgets()
{
return new List<IWidgetInfo>(_widgetSet.WidgetInfo).ToArray();
}
+ /// <summary>
+ /// Gets information about a specific container
+ /// </summary>
+ /// <param name="name"></param>
+ /// <returns></returns>
public IApplicationDefinitionContainerInfo GetContainerInfo(string name)
{
Check.NotEmpty(name, "name");
@@ -70,6 +91,11 @@
return null;
}
+ /// <summary>
+ /// Gets information about a specific template
+ /// </summary>
+ /// <param name="name"></param>
+ /// <returns></returns>
public IApplicationDefinitionTemplateInfo GetTemplateInfo(string name)
{
Check.NotEmpty(name, "name");
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/FusionWidgetEditorMap.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/FusionWidgetEditorMap.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/FusionWidgetEditorMap.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -26,6 +26,9 @@
namespace Maestro.Editors.Fusion
{
+ /// <summary>
+ /// Maintains the collection of specialized widget editors
+ /// </summary>
public static class FusionWidgetEditorMap
{
static Dictionary<string, Type> _edTypes;
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditorFactory.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditorFactory.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditorFactory.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -26,6 +26,9 @@
{
using WidgetEditors;
+ /// <summary>
+ /// A widget editor factory class
+ /// </summary>
public static class WidgetEditorFactory
{
private static Dictionary<string, Type> _editorTypes;
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/IWidgetEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/IWidgetEditor.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/IWidgetEditor.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -25,10 +25,22 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
+ /// <summary>
+ /// The base interface for widget editors
+ /// </summary>
public interface IWidgetEditor
{
+ /// <summary>
+ /// Initializes the editor
+ /// </summary>
+ /// <param name="widget"></param>
+ /// <param name="context"></param>
+ /// <param name="edsvc"></param>
void Setup(IWidget widget, FlexibleLayoutEditorContext context, IEditorService edsvc);
+ /// <summary>
+ /// Gets the underyling Windows Forms control
+ /// </summary>
Control Content { get; }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetEditorBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetEditorBase.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/WidgetEditorBase.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -29,13 +29,25 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
+ /// <summary>
+ /// Base widget editor class
+ /// </summary>
public partial class WidgetEditorBase : UserControl, IWidgetEditor
{
+ /// <summary>
+ /// Constructor
+ /// </summary>
public WidgetEditorBase()
{
InitializeComponent();
}
+ /// <summary>
+ /// Initializes the editor
+ /// </summary>
+ /// <param name="widget"></param>
+ /// <param name="context"></param>
+ /// <param name="edsvc"></param>
public void Setup(IWidget widget, FlexibleLayoutEditorContext context, IEditorService edsvc)
{
TextBoxBinder.BindText(txtName, widget, "Name");
@@ -43,6 +55,9 @@
TextBoxBinder.BindText(txtLocation, widget, "Location");
}
+ /// <summary>
+ /// Gets the underyling Windows Forms control
+ /// </summary>
public Control Content
{
get { return this; }
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/RasterLayerEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/RasterLayerEditorCtrl.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/RasterLayerEditorCtrl.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -33,6 +33,9 @@
/// </summary>
public partial class RasterLayerEditorCtrl : EditorBase
{
+ /// <summary>
+ /// Constructor
+ /// </summary>
public RasterLayerEditorCtrl()
{
InitializeComponent();
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -34,7 +34,7 @@
namespace Maestro.Editors.LayerDefinition.Vector.Scales
{
- public partial class SymbolInstancesDialog : Form
+ internal partial class SymbolInstancesDialog : Form
{
private IEditorService _edSvc;
private ICompositeSymbolization _comp;
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -18,20 +18,19 @@
//
#endregion
using System;
-using System.Drawing;
using System.Collections;
using System.ComponentModel;
-using System.Windows.Forms;
using System.Data;
-using OSGeo.MapGuide.ObjectModels.LayerDefinition;
-using Maestro.Editors.Common;
-using OSGeo.MapGuide.MaestroAPI;
-using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using System.Drawing;
using System.Globalization;
-using OSGeo.MapGuide.ObjectModels;
-using OSGeo.MapGuide.ObjectModels;
using System.Threading;
+using System.Windows.Forms;
+using Maestro.Editors.Common;
+using OSGeo.MapGuide.MaestroAPI;
using OSGeo.MapGuide.MaestroAPI.Schema;
+using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
{
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.Designer.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.Designer.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -188,9 +188,8 @@
// VectorLayerStyleSectionCtrl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
- this.HeaderText = "Layer Styles";
- this.Name = "VectorLayerStyleSectionCtrl";
resources.ApplyResources(this, "$this");
+ this.Name = "VectorLayerStyleSectionCtrl";
this.contentPanel.ResumeLayout(false);
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.resx 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.resx 2011-07-12 12:50:15 UTC (rev 5987)
@@ -471,6 +471,9 @@
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
+ <data name="$this.HeaderText" xml:space="preserve">
+ <value>Layer Styles</value>
+ </data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>638, 432</value>
</data>
@@ -514,6 +517,6 @@
<value>VectorLayerStyleSectionCtrl</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>Maestro.Editors.Common.EditorBindableCollapsiblePanel, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.Common.EditorBindableCollapsiblePanel, Maestro.Editors, Version=3.5.0.5977, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/LoadProcedureEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/LoadProcedureEditorCtrl.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/LoadProcedureEditorCtrl.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -146,10 +146,5 @@
return proc.CurrentConnection.ExecuteLoadProcedure(proc, cb, true);
}
-
- /// <summary>
- /// Occurs when [resource changed].
- /// </summary>
- public event EventHandler ResourceChanged;
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/PrintLayout/TextDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/PrintLayout/TextDialog.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/PrintLayout/TextDialog.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -64,7 +64,7 @@
set { txtFontName.Text = value; }
}
- public float FontHeight
+ public new float FontHeight
{
get { return Convert.ToSingle(numFontHeight.Value); }
set { numFontHeight.Value = Convert.ToDecimal(value); }
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/AdvancedSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/AdvancedSettingsCtrl.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/AdvancedSettingsCtrl.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -29,8 +29,8 @@
namespace Maestro.Editors.SymbolDefinition
{
- [ToolboxItem(true)]
- public partial class AdvancedSettingsCtrl : EditorBindableCollapsiblePanel
+ [ToolboxItem(false)]
+ internal partial class AdvancedSettingsCtrl : EditorBindableCollapsiblePanel
{
public AdvancedSettingsCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/CompoundSymbolDefinitionEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/CompoundSymbolDefinitionEditorCtrl.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/CompoundSymbolDefinitionEditorCtrl.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -32,6 +32,10 @@
namespace Maestro.Editors.SymbolDefinition
{
+ /// <summary>
+ /// A resource editor for Compound Symbol Definitions
+ /// </summary>
+ [ToolboxItem(true)]
public partial class CompoundSymbolDefinitionEditorCtrl : EditorBase
{
const int IDX_SYMBOL = 0;
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GeneralSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GeneralSettingsCtrl.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GeneralSettingsCtrl.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -30,8 +30,8 @@
namespace Maestro.Editors.SymbolDefinition
{
- [ToolboxItem(true)]
- public partial class GeneralSettingsCtrl : EditorBindableCollapsiblePanel
+ [ToolboxItem(false)]
+ internal partial class GeneralSettingsCtrl : EditorBindableCollapsiblePanel
{
public GeneralSettingsCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -33,7 +33,7 @@
namespace Maestro.Editors.SymbolDefinition.GraphicsEditors
{
- public partial class ImageDialog : Form
+ internal partial class ImageDialog : Form
{
private ISimpleSymbolDefinition _ssd;
private IImageGraphic _image;
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -30,7 +30,7 @@
namespace Maestro.Editors.SymbolDefinition.GraphicsEditors
{
- public partial class PathDialog : Form
+ internal partial class PathDialog : Form
{
private ISimpleSymbolDefinition _sym;
private EditorBindableCollapsiblePanel _ed;
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -30,7 +30,7 @@
namespace Maestro.Editors.SymbolDefinition.GraphicsEditors
{
- public partial class TextDialog : Form
+ internal partial class TextDialog : Form
{
private ISimpleSymbolDefinition _sym;
private EditorBindableCollapsiblePanel _ed;
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParameterSelector.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParameterSelector.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParameterSelector.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -28,7 +28,7 @@
namespace Maestro.Editors.SymbolDefinition
{
- public partial class ParameterSelector : Form
+ internal partial class ParameterSelector : Form
{
private List<IParameter> _unfiltered;
private List<IParameter> _filtered;
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParametersCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParametersCtrl.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParametersCtrl.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -29,8 +29,8 @@
namespace Maestro.Editors.SymbolDefinition
{
- [ToolboxItem(true)]
- public partial class ParametersCtrl : EditorBindableCollapsiblePanel
+ [ToolboxItem(false)]
+ internal partial class ParametersCtrl : EditorBindableCollapsiblePanel
{
public ParametersCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionDialog.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionDialog.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -28,10 +28,18 @@
namespace Maestro.Editors.SymbolDefinition
{
+ /// <summary>
+ /// A dialog-based version of the <see cref="SimpleSymbolDefinitionEditorCtrl"/>
+ /// </summary>
public partial class SimpleSymbolDefinitionDialog : Form
{
private IEditorService _edSvc;
+ /// <summary>
+ /// Constructor
+ /// </summary>
+ /// <param name="edSvc"></param>
+ /// <param name="symDef"></param>
public SimpleSymbolDefinitionDialog(IEditorService edSvc, ISimpleSymbolDefinition symDef)
{
InitializeComponent();
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionEditorCtrl.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionEditorCtrl.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -27,6 +27,9 @@
namespace Maestro.Editors.SymbolDefinition
{
+ /// <summary>
+ /// A resource editor for Simple Symbol Definitions
+ /// </summary>
[ToolboxItem(true)]
public partial class SimpleSymbolDefinitionEditorCtrl : EditorBase
{
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolField.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolField.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolField.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -34,6 +34,9 @@
namespace Maestro.Editors.SymbolDefinition
{
+ /// <summary>
+ /// A UI control for editing symbol definition settings
+ /// </summary>
[ToolboxItem(true)]
[Designer(typeof(SymbolFieldDesigner))]
public partial class SymbolField : UserControl
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolGraphicsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolGraphicsCtrl.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolGraphicsCtrl.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -30,8 +30,8 @@
namespace Maestro.Editors.SymbolDefinition
{
- [ToolboxItem(true)]
- public partial class SymbolGraphicsCtrl : EditorBindableCollapsiblePanel
+ [ToolboxItem(false)]
+ internal partial class SymbolGraphicsCtrl : EditorBindableCollapsiblePanel
{
public SymbolGraphicsCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterDialog.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterDialog.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -28,7 +28,7 @@
namespace Maestro.Editors.SymbolDefinition
{
- public partial class SymbolParameterDialog : Form
+ internal partial class SymbolParameterDialog : Form
{
private IParameter _p;
private bool _init = false;
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterEditor.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterEditor.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -27,7 +27,7 @@
namespace Maestro.Editors.SymbolDefinition
{
- public partial class SymbolParameterEditor : Form
+ internal partial class SymbolParameterEditor : Form
{
public SymbolParameterEditor()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/UsageContextsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/UsageContextsCtrl.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/UsageContextsCtrl.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -29,8 +29,8 @@
namespace Maestro.Editors.SymbolDefinition
{
- [ToolboxItem(true)]
- public partial class UsageContextsCtrl : EditorBindableCollapsiblePanel
+ [ToolboxItem(false)]
+ internal partial class UsageContextsCtrl : EditorBindableCollapsiblePanel
{
public UsageContextsCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/TilePositionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/TilePositionEditor.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/TilePositionEditor.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -28,7 +28,8 @@
namespace Maestro.Editors.WatermarkDefinition
{
- public partial class TilePositionEditor : UserControl
+ [ToolboxItem(false)]
+ internal partial class TilePositionEditor : UserControl
{
private ITilePosition _pos;
Modified: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -33,7 +33,8 @@
namespace Maestro.Editors.WatermarkDefinition
{
- public partial class WatermarkCollectionEditorCtrl : CollapsiblePanel
+ [ToolboxItem(false)]
+ internal partial class WatermarkCollectionEditorCtrl : CollapsiblePanel
{
private IWatermarkCollection _watermarks;
Modified: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkContentCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkContentCtrl.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkContentCtrl.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -31,8 +31,8 @@
namespace Maestro.Editors.WatermarkDefinition
{
- [ToolboxItem(true)]
- public partial class WatermarkContentCtrl : EditorBindableCollapsiblePanel
+ [ToolboxItem(false)]
+ internal partial class WatermarkContentCtrl : EditorBindableCollapsiblePanel
{
public WatermarkContentCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkEditorCtrl.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkEditorCtrl.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -30,8 +30,14 @@
namespace Maestro.Editors.WatermarkDefinition
{
+ /// <summary>
+ /// Editor control for Watermark Definitions
+ /// </summary>
public partial class WatermarkEditorCtrl : EditorBase
{
+ /// <summary>
+ /// Constructor
+ /// </summary>
public WatermarkEditorCtrl()
{
InitializeComponent();
Modified: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditorDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditorDialog.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditorDialog.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -29,7 +29,7 @@
namespace Maestro.Editors.WatermarkDefinition
{
- public partial class WatermarkInstanceEditorDialog : Form
+ internal partial class WatermarkInstanceEditorDialog : Form
{
private WatermarkInstanceEditor _ed;
Modified: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkSettingsCtrl.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkSettingsCtrl.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -30,8 +30,8 @@
namespace Maestro.Editors.WatermarkDefinition
{
- [ToolboxItem(true)]
- public partial class WatermarkSettingsCtrl : EditorBindableCollapsiblePanel
+ [ToolboxItem(false)]
+ internal partial class WatermarkSettingsCtrl : EditorBindableCollapsiblePanel
{
public WatermarkSettingsCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/XYPositionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/XYPositionEditor.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/XYPositionEditor.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -28,7 +28,8 @@
namespace Maestro.Editors.WatermarkDefinition
{
- public partial class XYPositionEditor : UserControl
+ [ToolboxItem(false)]
+ internal partial class XYPositionEditor : UserControl
{
private IXYPosition _pos;
private bool _init = false;
Modified: trunk/Tools/Maestro/MaestroAPITestRunner/App.config
===================================================================
--- trunk/Tools/Maestro/MaestroAPITestRunner/App.config 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/MaestroAPITestRunner/App.config 2011-07-12 12:50:15 UTC (rev 5987)
@@ -1,20 +1,24 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0"?>
<configuration>
<system.net>
<defaultProxy>
- <proxy bypassonlocal="false" usesystemdefault="true" />
+ <proxy bypassonlocal="false" usesystemdefault="true"/>
</defaultProxy>
</system.net>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
- <assemblyIdentity name="MapGuideDotNetApi" publicKeyToken="f526c48929fda856" />
+ <assemblyIdentity name="MapGuideDotNetApi" publicKeyToken="f526c48929fda856"/>
<codeBase version="1.0.0.1" href="MapGuideDotNetApi-2.2.dll"/>
- <bindingRedirect oldVersion="2.0.0.2308" newVersion="1.0.0.1" />
+ <bindingRedirect oldVersion="2.0.0.2308" newVersion="1.0.0.1"/>
</dependentAssembly>
- </assemblyBinding>
+ <dependentAssembly>
+ <assemblyIdentity name="MapGuideDotNetApi" publicKeyToken="F526C48929FDA856" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-2.0.0.2308" newVersion="2.0.0.2308"/>
+ </dependentAssembly>
+ </assemblyBinding>
</runtime>
-</configuration>
\ No newline at end of file
+</configuration>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/IServerConnection.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/IServerConnection.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/IServerConnection.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -34,11 +34,17 @@
/// <see cref="T:OSGeo.MapGuide.MaestroAPI.ConnectionProviderRegistry"/> class.
///
/// All implementations supports the base services of the MapGuide Geospatial API:
- /// - Resource Service (<see cref="T:OSGeo.MapGuide.MaestroAPI.Services.IResourceService"/>) for manipulation of repositories and resources
- /// - Feature Service (<see cref="T:OSGeo.MapGuide.MaestroAPI.Services.IFeatureService"/>) an abstraction layer for querying feature data in
- /// technology-independent manner.
- /// - Coordinate System Catalog (<see cref="T:OSGeo.MapGuide.MaestroAPI.CoordinateSystem.ICoordinateSystemCatalog"/> for querying coordinate
- /// systems and for translating WKT, cs code and EPSG codes to other forms
+ /// <list type="bullet">
+ /// <item>
+ /// <description>Resource Service (<see cref="T:OSGeo.MapGuide.MaestroAPI.Services.IResourceService"/>) for manipulation of repositories and resources</description>
+ /// </item>
+ /// <item>
+ /// <description>Feature Service (<see cref="T:OSGeo.MapGuide.MaestroAPI.Services.IFeatureService"/>) an abstraction layer for querying feature data in technology-independent manner.</description>
+ /// </item>
+ /// <item>
+ /// <description>Coordinate System Catalog (<see cref="T:OSGeo.MapGuide.MaestroAPI.CoordinateSystem.ICoordinateSystemCatalog"/> for querying coordinate systems and for translating WKT, cs code and EPSG codes to other forms</description>
+ /// </item>
+ /// </list>
///
/// Additional services are supported at various levels depending on the implementation.
/// The <see cref="P:OSGeo.MapGuide.MaestroAPI.IServerConnection.Capabilities"/> property provides information about
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcedureInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcedureInterfaces.cs 2011-07-11 10:45:00 UTC (rev 5986)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LoadProcedureInterfaces.cs 2011-07-12 12:50:15 UTC (rev 5987)
@@ -27,7 +27,7 @@
namespace OSGeo.MapGuide.ObjectModels.LoadProcedure
{
/// <summary>
- /// Defines how to handle duplicate SDF2 keys
+ /// Defines how to handle duplicate SDF2 keys (not supported by Maestro)
/// </summary>
[System.SerializableAttribute()]
public enum SdfKeyTreatmentType
@@ -48,27 +48,27 @@
public enum LoadType
{
/// <summary>
- ///
+ /// A Load Procedure for SDF 3.0 files
/// </summary>
Sdf,
/// <summary>
- ///
+ /// A Load Procedure for SHP files
/// </summary>
Shp,
/// <summary>
- ///
+ /// A Load Procedure for DWF files
/// </summary>
Dwf,
/// <summary>
- ///
+ /// A Load Procedure for Raster files (not supported by Maestro)
/// </summary>
Raster,
/// <summary>
- ///
+ /// A Load Procedure for DWG files (not supported by Maestro)
/// </summary>
Dwg,
/// <summary>
- ///
+ /// A Load Procedure for SQLite files
/// </summary>
Sqlite
}
@@ -102,7 +102,28 @@
}
/// <summary>
- /// Base type of all load procedures
+ /// Base type of all load procedures. All Load Procedures at the minimum require
+ /// the following information:
+ ///
+ /// <list type="number">
+ /// <item>
+ /// <description>A list of source files.</description>
+ /// </item>
+ /// <item>
+ /// <description>The root path to load into</description>
+ /// </item>
+ /// <item>
+ /// <description>The folder where spatial data sources will be created [optional, but useless if not specified]</description>
+ /// </item>
+ /// <item>
+ /// <description>The folder where layers will be created [optional. dependent on #3]</description>
+ /// </item>
+ /// </list>
+ ///
+ /// Once initialized, load procedures can be executed via <see cref="M:OSGeo.MapGuide.MaestroAPI.MgServerConnectionBase.ExecuteLoadProcedure(OSGeo.MapGuide.ObjectModels.LoadProcedure.ILoadProcedure,OSGeo.MapGuide.MaestroAPI.LengthyOperationProgressCallBack,System.Boolean)"/> method
+ ///
+ /// Because Load Procedures are also resources, they can be saved into the library repository via the <see cref="M:OSGeo.MapGuide.MaestroAPI.Services.IResourceService.SaveResource(OSGeo.MapGuide.MaestroAPI.Resource.IResource)"/> method
+ /// and retrieved from the repository via the <see cref="M:OSGeo.MapGuide.MaestroAPI.Services.IResourceService.GetResource(System.String)"/> method
/// </summary>
public interface IBaseLoadProcedure : INotifyPropertyChanged
{
@@ -143,7 +164,9 @@
string CoordinateSystem { get; set; }
/// <summary>
- /// Gets or sets a value indicating whether [generate spatial data sources].
+ /// Gets or sets a value indicating whether to create a spatial data source for each source
+ /// file. The spatial data sources will be created under the <see cref="SpatialDataSourcesFolder"/>
+ /// under the <see cref="SpatialDataSourcesPath"/>
/// </summary>
/// <value>
/// <c>true</c> if [generate spatial data sources]; otherwise, <c>false</c>.
@@ -163,7 +186,8 @@
string SpatialDataSourcesFolder { get; set; }
/// <summary>
- /// Gets or sets a value indicating whether [generate layers].
+ /// Gets or sets a value indicating whether to create a layer for each spatial data source that
+ /// is created. This will be created in the <see cref="LayersFolder"/> under the <see cref="LayersPath"/>
/// </summary>
/// <value><c>true</c> if [generate layers]; otherwise, <c>false</c>.</value>
bool GenerateLayers { get; set; }
@@ -181,19 +205,19 @@
string LayersFolder { get; set; }
/// <summary>
- /// Gets or sets the generate maps.
+ /// Gets or sets the generate maps. Not supported by Maestro
/// </summary>
/// <value>The generate maps.</value>
bool? GenerateMaps { get; set; }
/// <summary>
- /// Gets or sets the maps path.
+ /// Gets or sets the maps path. Not supported by Maestro
/// </summary>
/// <value>The maps path.</value>
string MapsPath { get; set; }
/// <summary>
- /// Gets or sets the maps folder.
+ /// Gets or sets the maps folder. Not supported by Maestro
/// </summary>
/// <value>The maps folder.</value>
string MapsFolder { get; set; }
More information about the mapguide-commits
mailing list