[mapguide-commits] r5238 - in sandbox/maestro-3.0:
Maestro.Base/Commands Maestro.Base/UI Maestro.Editors
Maestro.Editors/FeatureSource
Maestro.Editors/FeatureSource/Providers/Rdbms
Maestro.Editors/Properties
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Oct 4 00:39:35 EDT 2010
Author: jng
Date: 2010-10-04 04:39:35 +0000 (Mon, 04 Oct 2010)
New Revision: 5238
Added:
sandbox/maestro-3.0/Maestro.Editors/FeatureSource/FsEditorMap.cs
sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/MySqlCtrl.Designer.cs
sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/MySqlCtrl.cs
sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/PostgreSqlCtrl.Designer.cs
sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/PostgreSqlCtrl.cs
sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.Designer.cs
sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs
sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.resx
sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.Designer.cs
sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.cs
sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.resx
sandbox/maestro-3.0/Maestro.Editors/FsEditorMap.xml
Modified:
sandbox/maestro-3.0/Maestro.Base/Commands/SaveResourceAsCommand.cs
sandbox/maestro-3.0/Maestro.Base/UI/SiteExplorer.cs
sandbox/maestro-3.0/Maestro.Editors/FeatureSource/FeatureSourceEditorCtrl.cs
sandbox/maestro-3.0/Maestro.Editors/Maestro.Editors.csproj
sandbox/maestro-3.0/Maestro.Editors/Properties/Resources.Designer.cs
sandbox/maestro-3.0/Maestro.Editors/Properties/Resources.resx
Log:
3.0 sandbox changes:
- Add specialized RDBMS feature source editors (MySQL, PostgreSQL, SQL Server 2008)
- Add a FsEditorMap.xml file that allows the Feature Source Editor to resolve to a specialized implementation. If resolution fails, the generic one will be used.
- Suppress NRE when refreshing the Site Explorer that hasn't been expanded for the first time. The side-effects of doing this is minor (Site Explorer not auto-expanding to where the resource was created).
Modified: sandbox/maestro-3.0/Maestro.Base/Commands/SaveResourceAsCommand.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Base/Commands/SaveResourceAsCommand.cs 2010-10-03 08:47:23 UTC (rev 5237)
+++ sandbox/maestro-3.0/Maestro.Base/Commands/SaveResourceAsCommand.cs 2010-10-04 04:39:35 UTC (rev 5238)
@@ -49,8 +49,19 @@
{
ed.EditorService.SaveAs(picker.ResourceID);
- var rid = new ResourceIdentifier(picker.ResourceID);
- exp.RefreshModel(rid.ParentFolder);
+ try
+ {
+ var rid = new ResourceIdentifier(picker.ResourceID);
+ exp.RefreshModel(rid.ParentFolder);
+ }
+ catch (NullReferenceException)
+ {
+ //HACK/FIXME: This can NRE if we created a new resource and
+ //we haven't expanded the Site Explorer for the first
+ //time. Muffling this NRE will just mean that the Site
+ //Explorer won't auto-expand to the folder where this
+ //resource was created. So nothing major.
+ }
}
}
}
Modified: sandbox/maestro-3.0/Maestro.Base/UI/SiteExplorer.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Base/UI/SiteExplorer.cs 2010-10-03 08:47:23 UTC (rev 5237)
+++ sandbox/maestro-3.0/Maestro.Base/UI/SiteExplorer.cs 2010-10-04 04:39:35 UTC (rev 5238)
@@ -241,6 +241,9 @@
public void ExpandNode(string folderId)
{
+ if ("Library://".Equals(folderId))
+ return;
+
var path = _model.GetPathFromResourceId(folderId);
if (path != null)
{
Modified: sandbox/maestro-3.0/Maestro.Editors/FeatureSource/FeatureSourceEditorCtrl.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/FeatureSource/FeatureSourceEditorCtrl.cs 2010-10-03 08:47:23 UTC (rev 5237)
+++ sandbox/maestro-3.0/Maestro.Editors/FeatureSource/FeatureSourceEditorCtrl.cs 2010-10-04 04:39:35 UTC (rev 5238)
@@ -48,7 +48,7 @@
service.RegisterCustomNotifier(this);
Debug.Assert(_fs != null);
- CollapsiblePanel panel = ResolveTopPanel(_fs.Provider);
+ CollapsiblePanel panel = FsEditorMap.GetPanel(_fs.Provider);
var b = panel as IEditorBindable;
if (b != null)
b.Bind(service);
@@ -69,18 +69,5 @@
this.Controls.Add(ov);
this.Controls.Add(panel);
}
-
- private static CollapsiblePanel ResolveTopPanel(string provider)
- {
- //TODO: Define specialized editors via the addin registry
-
- string name = provider.ToUpper();
- if (name.StartsWith("OSGEO.SDF"))
- return new SdfFileCtrl();
- else if (name.StartsWith("OSGEO.SHP"))
- return new ShpFileCtrl();
- else //TODO: Add support for other providers
- return new GenericCtrl();
- }
}
}
Added: sandbox/maestro-3.0/Maestro.Editors/FeatureSource/FsEditorMap.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/FeatureSource/FsEditorMap.cs (rev 0)
+++ sandbox/maestro-3.0/Maestro.Editors/FeatureSource/FsEditorMap.cs 2010-10-04 04:39:35 UTC (rev 5238)
@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Maestro.Shared.UI;
+using Maestro.Editors.FeatureSource.Providers;
+using System.Xml;
+
+namespace Maestro.Editors.FeatureSource
+{
+ public static class FsEditorMap
+ {
+ static Dictionary<string, Type> _editors;
+
+ static FsEditorMap()
+ {
+ _editors = new Dictionary<string, Type>();
+ if (System.IO.File.Exists("FsEditorMap.xml"))
+ {
+ var doc = new XmlDocument();
+ doc.Load("FsEditorMap.xml");
+ var list = doc.SelectNodes("//FeatureSourceEditorMap/Editor");
+ foreach (XmlNode node in list)
+ {
+ try
+ {
+ string provider = node.Attributes["provider"].Value.ToUpper();
+ string typeName = node.Attributes["type"].Value;
+
+ _editors[provider] = Type.GetType(typeName);
+ }
+ catch { }
+ }
+ }
+ }
+
+ static string Normalize(string provider)
+ {
+ string[] tokens = provider.Split('.');
+ if (tokens.Length == 2)
+ return provider;
+ else
+ return tokens[0] + "." + tokens[1];
+ }
+
+ public static CollapsiblePanel GetPanel(string provider)
+ {
+ CollapsiblePanel panel = null;
+ provider = Normalize(provider);
+
+ //Try to obtain a specialized editor if possible, otherwise
+ //fall back to the generic one
+ string name = provider.ToUpper();
+ try
+ {
+ if (_editors.ContainsKey(name))
+ {
+ panel = (CollapsiblePanel)Activator.CreateInstance(_editors[name]);
+ }
+ else
+ {
+ panel = new GenericCtrl();
+ }
+ }
+ finally
+ {
+ if (panel == null)
+ panel = new GenericCtrl();
+ }
+
+ return panel;
+ }
+ }
+}
Added: sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/MySqlCtrl.Designer.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/MySqlCtrl.Designer.cs (rev 0)
+++ sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/MySqlCtrl.Designer.cs 2010-10-04 04:39:35 UTC (rev 5238)
@@ -0,0 +1,37 @@
+namespace Maestro.Editors.FeatureSource.Providers.Rdbms
+{
+ partial class MySqlCtrl
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ components = new System.ComponentModel.Container();
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ }
+
+ #endregion
+ }
+}
Added: sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/MySqlCtrl.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/MySqlCtrl.cs (rev 0)
+++ sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/MySqlCtrl.cs 2010-10-04 04:39:35 UTC (rev 5238)
@@ -0,0 +1,53 @@
+#region Disclaimer / License
+// Copyright (C) 2010, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+#endregion
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Maestro.Editors.FeatureSource.Providers.Rdbms
+{
+ public partial class MySqlCtrl : RdbmsBaseCtrl
+ {
+ public MySqlCtrl()
+ {
+ InitializeComponent();
+ }
+
+ public override string Provider
+ {
+ get
+ {
+ return "OSGeo.MySQL";
+ }
+ }
+
+ public override string Title
+ {
+ get
+ {
+ return Properties.Resources.FsMySql;
+ }
+ }
+ }
+}
Added: sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/PostgreSqlCtrl.Designer.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/PostgreSqlCtrl.Designer.cs (rev 0)
+++ sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/PostgreSqlCtrl.Designer.cs 2010-10-04 04:39:35 UTC (rev 5238)
@@ -0,0 +1,37 @@
+namespace Maestro.Editors.FeatureSource.Providers.Rdbms
+{
+ partial class PostgreSqlCtrl
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ components = new System.ComponentModel.Container();
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ }
+
+ #endregion
+ }
+}
Added: sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/PostgreSqlCtrl.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/PostgreSqlCtrl.cs (rev 0)
+++ sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/PostgreSqlCtrl.cs 2010-10-04 04:39:35 UTC (rev 5238)
@@ -0,0 +1,53 @@
+#region Disclaimer / License
+// Copyright (C) 2010, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+#endregion
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Maestro.Editors.FeatureSource.Providers.Rdbms
+{
+ public partial class PostgreSqlCtrl : RdbmsBaseCtrl
+ {
+ public PostgreSqlCtrl()
+ {
+ InitializeComponent();
+ }
+
+ public override string Provider
+ {
+ get
+ {
+ return "OSGeo.PostgreSQL";
+ }
+ }
+
+ public override string Title
+ {
+ get
+ {
+ return Properties.Resources.FsPostgreSql;
+ }
+ }
+ }
+}
Added: sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.Designer.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.Designer.cs (rev 0)
+++ sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.Designer.cs 2010-10-04 04:39:35 UTC (rev 5238)
@@ -0,0 +1,198 @@
+namespace Maestro.Editors.FeatureSource.Providers.Rdbms
+{
+ partial class RdbmsBaseCtrl
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.label1 = new System.Windows.Forms.Label();
+ this.txtService = new System.Windows.Forms.TextBox();
+ this.txtUsername = new System.Windows.Forms.TextBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.txtPassword = new System.Windows.Forms.TextBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.btnConnect = new System.Windows.Forms.Button();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.cmbDataStore = new System.Windows.Forms.ComboBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.contentPanel.SuspendLayout();
+ this.groupBox1.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // contentPanel
+ //
+ this.contentPanel.Controls.Add(this.groupBox2);
+ this.contentPanel.Controls.Add(this.groupBox1);
+ this.contentPanel.Size = new System.Drawing.Size(449, 228);
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(13, 22);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(43, 13);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "Service";
+ //
+ // txtService
+ //
+ this.txtService.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtService.Location = new System.Drawing.Point(80, 19);
+ this.txtService.Name = "txtService";
+ this.txtService.Size = new System.Drawing.Size(315, 20);
+ this.txtService.TabIndex = 1;
+ //
+ // txtUsername
+ //
+ this.txtUsername.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtUsername.Location = new System.Drawing.Point(80, 45);
+ this.txtUsername.Name = "txtUsername";
+ this.txtUsername.Size = new System.Drawing.Size(315, 20);
+ this.txtUsername.TabIndex = 3;
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(13, 48);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(55, 13);
+ this.label2.TabIndex = 2;
+ this.label2.Text = "Username";
+ //
+ // txtPassword
+ //
+ this.txtPassword.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtPassword.Location = new System.Drawing.Point(80, 71);
+ this.txtPassword.Name = "txtPassword";
+ this.txtPassword.Size = new System.Drawing.Size(315, 20);
+ this.txtPassword.TabIndex = 5;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(13, 74);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(53, 13);
+ this.label3.TabIndex = 4;
+ this.label3.Text = "Password";
+ //
+ // groupBox1
+ //
+ this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBox1.Controls.Add(this.btnConnect);
+ this.groupBox1.Controls.Add(this.txtService);
+ this.groupBox1.Controls.Add(this.txtPassword);
+ this.groupBox1.Controls.Add(this.label1);
+ this.groupBox1.Controls.Add(this.label3);
+ this.groupBox1.Controls.Add(this.label2);
+ this.groupBox1.Controls.Add(this.txtUsername);
+ this.groupBox1.Location = new System.Drawing.Point(15, 17);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(421, 128);
+ this.groupBox1.TabIndex = 6;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "Connection Properties";
+ //
+ // btnConnect
+ //
+ this.btnConnect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnConnect.Location = new System.Drawing.Point(320, 97);
+ this.btnConnect.Name = "btnConnect";
+ this.btnConnect.Size = new System.Drawing.Size(75, 23);
+ this.btnConnect.TabIndex = 6;
+ this.btnConnect.Text = "Connect";
+ this.btnConnect.UseVisualStyleBackColor = true;
+ this.btnConnect.Click += new System.EventHandler(this.btnConnect_Click);
+ //
+ // groupBox2
+ //
+ this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBox2.Controls.Add(this.cmbDataStore);
+ this.groupBox2.Controls.Add(this.label4);
+ this.groupBox2.Location = new System.Drawing.Point(15, 151);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(421, 62);
+ this.groupBox2.TabIndex = 7;
+ this.groupBox2.TabStop = false;
+ this.groupBox2.Text = "Other Options";
+ //
+ // cmbDataStore
+ //
+ this.cmbDataStore.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.cmbDataStore.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbDataStore.FormattingEnabled = true;
+ this.cmbDataStore.Location = new System.Drawing.Point(80, 24);
+ this.cmbDataStore.Name = "cmbDataStore";
+ this.cmbDataStore.Size = new System.Drawing.Size(315, 21);
+ this.cmbDataStore.TabIndex = 1;
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(13, 27);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(58, 13);
+ this.label4.TabIndex = 0;
+ this.label4.Text = "Data Store";
+ //
+ // RdbmsBaseCtrl
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Name = "RdbmsBaseCtrl";
+ this.Size = new System.Drawing.Size(449, 255);
+ this.contentPanel.ResumeLayout(false);
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ this.groupBox2.ResumeLayout(false);
+ this.groupBox2.PerformLayout();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.GroupBox groupBox2;
+ private System.Windows.Forms.ComboBox cmbDataStore;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.TextBox txtService;
+ private System.Windows.Forms.TextBox txtPassword;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TextBox txtUsername;
+ private System.Windows.Forms.Button btnConnect;
+ }
+}
Added: sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs (rev 0)
+++ sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs 2010-10-04 04:39:35 UTC (rev 5238)
@@ -0,0 +1,155 @@
+#region Disclaimer / License
+// Copyright (C) 2010, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+#endregion
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+using Maestro.Editors.Common;
+using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using Maestro.Shared.UI;
+
+namespace Maestro.Editors.FeatureSource.Providers.Rdbms
+{
+ public partial class RdbmsBaseCtrl : EditorBindableCollapsiblePanel
+ {
+ public RdbmsBaseCtrl()
+ {
+ InitializeComponent();
+ }
+
+ protected override void OnLoad(EventArgs e)
+ {
+ this.HeaderText = this.Title;
+ }
+
+ private IEditorService _edsvc;
+ private FeatureSourceType _fs;
+
+ public override void Bind(IEditorService service)
+ {
+ _edsvc = service;
+ _edsvc.RegisterCustomNotifier(this);
+ _fs = _edsvc.GetEditedResource() as FeatureSourceType;
+
+ //Set the field values
+ txtService.Text = _fs.GetConnectionProperty("Service");
+ txtUsername.Text = _fs.GetConnectionProperty("Username");
+ txtPassword.Text = _fs.GetConnectionProperty("Password");
+
+ UpdateDataStoreValues(true);
+
+ //Set initial value of data store if possible
+ var dstore = _fs.GetConnectionProperty("DataStore");
+ if (!string.IsNullOrEmpty(dstore) && cmbDataStore.Items.Count > 0)
+ {
+ var idx = cmbDataStore.Items.IndexOf(dstore);
+ if (idx >= 0)
+ cmbDataStore.SelectedIndex = idx;
+ }
+
+ //As our connection properties are not CLR properties,
+ //"manually" bind these fields
+ txtService.TextChanged += (s, e) =>
+ {
+ _fs.SetConnectionProperty("Service", txtService.Text);
+ };
+
+ txtUsername.TextChanged += (s, e) =>
+ {
+ _fs.SetConnectionProperty("Username", txtUsername.Text);
+ };
+
+ txtPassword.TextChanged += (s, e) =>
+ {
+ _fs.SetConnectionProperty("Password", txtPassword.Text);
+ };
+
+ cmbDataStore.SelectedIndexChanged += (s, e) =>
+ {
+ if (cmbDataStore.SelectedItem != null)
+ _fs.SetConnectionProperty("DataStore", cmbDataStore.SelectedItem.ToString());
+ };
+ }
+
+ public virtual string Title
+ {
+ get { return Properties.Resources.RdbmsFeatureSource; }
+ }
+
+ //MUST OVERRIDE
+ public virtual string Provider
+ {
+ get { throw new NotImplementedException(); }
+ }
+
+ private string GetPartialConnectionString()
+ {
+ var builder = new System.Data.Common.DbConnectionStringBuilder();
+ builder["Service"] = _fs.GetConnectionProperty("Service");
+ builder["Username"] = _fs.GetConnectionProperty("Username");
+ builder["Password"] = _fs.GetConnectionProperty("Password");
+ return builder.ToString();
+ }
+
+ private void btnConnect_Click(object sender, EventArgs e)
+ {
+ UpdateDataStoreValues(false);
+ }
+
+ private void UpdateDataStoreValues(bool silent)
+ {
+ using (new WaitCursor(this))
+ {
+ string[] values = null;
+ string reason = string.Empty;
+ try
+ {
+ var dstore = _edsvc.FeatureService.EnumerateDataStores(this.Provider, GetPartialConnectionString());
+ values = ConvertToArray(dstore);
+ }
+ catch (Exception ex) { reason = ex.ToString(); }
+ if (values != null && values.Length > 0)
+ {
+ cmbDataStore.DataSource = values;
+ }
+ else
+ {
+ if (!silent)
+ MessageBox.Show(string.Format(Properties.Resources.FailEnumDataStores, reason));
+
+ cmbDataStore.DataSource = null;
+ }
+ }
+ }
+
+ private static string[] ConvertToArray(OSGeo.MapGuide.ObjectModels.Common.DataStoreList dstore)
+ {
+ List<string> values = new List<string>();
+ foreach (var ds in dstore.DataStore)
+ {
+ values.Add(ds.Name);
+ }
+ return values.ToArray();
+ }
+ }
+}
Added: sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.resx
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.resx (rev 0)
+++ sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.resx 2010-10-04 04:39:35 UTC (rev 5238)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
Added: sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.Designer.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.Designer.cs (rev 0)
+++ sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.Designer.cs 2010-10-04 04:39:35 UTC (rev 5238)
@@ -0,0 +1,45 @@
+namespace Maestro.Editors.FeatureSource.Providers.Rdbms
+{
+ partial class SqlServerSpatialCtrl
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.SuspendLayout();
+ //
+ // SqlServerSpatialCtrl
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.HeaderText = "SQL Server Spatial Feature Source";
+ this.Name = "SqlServerSpatialCtrl";
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+ }
+}
Added: sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.cs (rev 0)
+++ sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.cs 2010-10-04 04:39:35 UTC (rev 5238)
@@ -0,0 +1,53 @@
+#region Disclaimer / License
+// Copyright (C) 2010, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+#endregion
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Maestro.Editors.FeatureSource.Providers.Rdbms
+{
+ public partial class SqlServerSpatialCtrl : RdbmsBaseCtrl
+ {
+ public SqlServerSpatialCtrl()
+ {
+ InitializeComponent();
+ }
+
+ public override string Provider
+ {
+ get
+ {
+ return "OSGeo.SQLServerSpatial";
+ }
+ }
+
+ public override string Title
+ {
+ get
+ {
+ return Properties.Resources.FsSqlServerSpatial;
+ }
+ }
+ }
+}
Added: sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.resx
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.resx (rev 0)
+++ sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.resx 2010-10-04 04:39:35 UTC (rev 5238)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
Added: sandbox/maestro-3.0/Maestro.Editors/FsEditorMap.xml
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/FsEditorMap.xml (rev 0)
+++ sandbox/maestro-3.0/Maestro.Editors/FsEditorMap.xml 2010-10-04 04:39:35 UTC (rev 5238)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+This file allows the feature source editor to resolve the correct specialized
+editor based on the given provider name of the feature source. If the editor
+cannot locate this file or fails to parse the entries defined here, the default
+generic editor will be used
+-->
+<FeatureSourceEditorMap>
+ <Editor provider="OSGeo.SDF" type="Maestro.Editors.FeatureSource.Providers.Sdf.SdfFileCtrl" />
+ <Editor provider="OSGeo.SHP" type="Maestro.Editors.FeatureSource.Providers.Shp.ShpFileCtrl" />
+ <Editor provider="OSGeo.SQLServerSpatial" type="Maestro.Editors.FeatureSource.Providers.Rdbms.SqlServerSpatialCtrl" />
+ <Editor provider="OSGeo.MySQL" type="Maestro.Editors.FeatureSource.Providers.Rdbms.MySqlCtrl" />
+ <Editor provider="OSGeo.PostgreSQL" type="Maestro.Editors.FeatureSource.Providers.Rdbms.PostgreSqlCtrl" />
+</FeatureSourceEditorMap>
\ No newline at end of file
Modified: sandbox/maestro-3.0/Maestro.Editors/Maestro.Editors.csproj
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/Maestro.Editors.csproj 2010-10-03 08:47:23 UTC (rev 5237)
+++ sandbox/maestro-3.0/Maestro.Editors/Maestro.Editors.csproj 2010-10-04 04:39:35 UTC (rev 5238)
@@ -176,6 +176,7 @@
<Compile Include="FeatureSource\FeatureSourceEditorCtrl.Designer.cs">
<DependentUpon>FeatureSourceEditorCtrl.cs</DependentUpon>
</Compile>
+ <Compile Include="FeatureSource\FsEditorMap.cs" />
<Compile Include="FeatureSource\Preview\LocalFeatureSourcePreviewCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -212,6 +213,30 @@
<Compile Include="FeatureSource\Providers\GenericCtrl.Designer.cs">
<DependentUpon>GenericCtrl.cs</DependentUpon>
</Compile>
+ <Compile Include="FeatureSource\Providers\Rdbms\MySqlCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="FeatureSource\Providers\Rdbms\MySqlCtrl.Designer.cs">
+ <DependentUpon>MySqlCtrl.cs</DependentUpon>
+ </Compile>
+ <Compile Include="FeatureSource\Providers\Rdbms\PostgreSqlCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="FeatureSource\Providers\Rdbms\PostgreSqlCtrl.Designer.cs">
+ <DependentUpon>PostgreSqlCtrl.cs</DependentUpon>
+ </Compile>
+ <Compile Include="FeatureSource\Providers\Rdbms\RdbmsBaseCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="FeatureSource\Providers\Rdbms\RdbmsBaseCtrl.Designer.cs">
+ <DependentUpon>RdbmsBaseCtrl.cs</DependentUpon>
+ </Compile>
+ <Compile Include="FeatureSource\Providers\Rdbms\SqlServerSpatialCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="FeatureSource\Providers\Rdbms\SqlServerSpatialCtrl.Designer.cs">
+ <DependentUpon>SqlServerSpatialCtrl.cs</DependentUpon>
+ </Compile>
<Compile Include="FeatureSource\Providers\Sdf\SdfFileCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -627,6 +652,12 @@
<DependentUpon>GenericCtrl.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="FeatureSource\Providers\Rdbms\RdbmsBaseCtrl.resx">
+ <DependentUpon>RdbmsBaseCtrl.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="FeatureSource\Providers\Rdbms\SqlServerSpatialCtrl.resx">
+ <DependentUpon>SqlServerSpatialCtrl.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="FeatureSource\Providers\Sdf\SdfFileCtrl.resx">
<DependentUpon>SdfFileCtrl.cs</DependentUpon>
<SubType>Designer</SubType>
@@ -1290,8 +1321,12 @@
<None Include="Resources\question.png" />
</ItemGroup>
<ItemGroup>
+ <Content Include="FsEditorMap.xml">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ </ItemGroup>
+ <ItemGroup>
<Folder Include="DrawingSource\Preview\" />
- <Folder Include="FeatureSource\Providers\Rdbms\" />
<Folder Include="LayerDefinition\Raster\" />
<Folder Include="PrintLayout\Logos\" />
<Folder Include="PrintLayout\Text\" />
Modified: sandbox/maestro-3.0/Maestro.Editors/Properties/Resources.Designer.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/Properties/Resources.Designer.cs 2010-10-03 08:47:23 UTC (rev 5237)
+++ sandbox/maestro-3.0/Maestro.Editors/Properties/Resources.Designer.cs 2010-10-04 04:39:35 UTC (rev 5238)
@@ -442,6 +442,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Failed to enumerate data stores. Reason: {0}.
+ /// </summary>
+ internal static string FailEnumDataStores {
+ get {
+ return ResourceManager.GetString("FailEnumDataStores", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to An error occured while copying file: {0}.
/// </summary>
internal static string FileCopyError {
@@ -597,6 +606,33 @@
}
}
+ /// <summary>
+ /// Looks up a localized string similar to MySQL Feature Source.
+ /// </summary>
+ internal static string FsMySql {
+ get {
+ return ResourceManager.GetString("FsMySql", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to PostgreSQL/PostGIS Feature Source.
+ /// </summary>
+ internal static string FsPostgreSql {
+ get {
+ return ResourceManager.GetString("FsPostgreSql", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to SQL Server Spatial Feature Source.
+ /// </summary>
+ internal static string FsSqlServerSpatial {
+ get {
+ return ResourceManager.GetString("FsSqlServerSpatial", resourceCulture);
+ }
+ }
+
internal static System.Drawing.Bitmap function {
get {
object obj = ResourceManager.GetObject("function", resourceCulture);
@@ -1635,6 +1671,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to RDBMS Feature Source.
+ /// </summary>
+ internal static string RdbmsFeatureSource {
+ get {
+ return ResourceManager.GetString("RdbmsFeatureSource", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to You have selected to restore the package at the root.
///You have also selected to delete the target before restoring.
///This will result in the entire repository being deleted and replaced with this package.
Modified: sandbox/maestro-3.0/Maestro.Editors/Properties/Resources.resx
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/Properties/Resources.resx 2010-10-03 08:47:23 UTC (rev 5237)
+++ sandbox/maestro-3.0/Maestro.Editors/Properties/Resources.resx 2010-10-04 04:39:35 UTC (rev 5238)
@@ -897,4 +897,19 @@
<data name="InvalidResourceIdNotSpecifiedType" xml:space="preserve">
<value>Invalid Resource Identifier. Not the specified type</value>
</data>
+ <data name="FailEnumDataStores" xml:space="preserve">
+ <value>Failed to enumerate data stores. Reason: {0}</value>
+ </data>
+ <data name="RdbmsFeatureSource" xml:space="preserve">
+ <value>RDBMS Feature Source</value>
+ </data>
+ <data name="FsMySql" xml:space="preserve">
+ <value>MySQL Feature Source</value>
+ </data>
+ <data name="FsPostgreSql" xml:space="preserve">
+ <value>PostgreSQL/PostGIS Feature Source</value>
+ </data>
+ <data name="FsSqlServerSpatial" xml:space="preserve">
+ <value>SQL Server Spatial Feature Source</value>
+ </data>
</root>
\ No newline at end of file
More information about the mapguide-commits
mailing list