[mapguide-commits] r4201 - in trunk/Tools/Maestro: Maestro Maestro/ResourceEditors MaestroAPI

[svn_mapguide at osgeo.org]

Author: ksgeograf
Date: 2009-08-30 09:45:35 -0400 (Sun, 30 Aug 2009)
New Revision: 4201

Modified:
   trunk/Tools/Maestro/Maestro/FormMain.cs
   trunk/Tools/Maestro/Maestro/ResourceEditors/XmlEditorControl.cs
   trunk/Tools/Maestro/MaestroAPI/ServerConnectionBase.cs
Log:
Maestro: Fixed issue #1079.
Fixed an issue with opening and saving an xml file directly.

Modified: trunk/Tools/Maestro/Maestro/FormMain.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/FormMain.cs	2009-08-30 13:18:59 UTC (rev 4200)
+++ trunk/Tools/Maestro/Maestro/FormMain.cs	2009-08-30 13:45:35 UTC (rev 4201)
@@ -2135,6 +2135,7 @@
 							tabItems.SelectedTab = edir.Page;
 							edir.HasChanged();
 							m_userControls.Add(document.ResourceId, edir);
+                            tabItems_SelectedIndexChanged(sender, e);
 
 						}
 				}

Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/XmlEditorControl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/XmlEditorControl.cs	2009-08-30 13:18:59 UTC (rev 4200)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/XmlEditorControl.cs	2009-08-30 13:45:35 UTC (rev 4201)
@@ -62,7 +62,6 @@
         private ToolStripButton LaunchExternalEditorButton;
 		private string m_resourceId = null;
         private bool m_modified = false;
-        private MaestroAPI.ServerConnectionI m_connection;
 
 		public XmlEditorControl(EditorInterface editor, string item)
 			: this(editor, editor.CurrentConnection.TryGetResourceType(item) == null ? editor.CurrentConnection.GetResourceXmlData(item) : editor.CurrentConnection.GetResource(item))
@@ -76,7 +75,6 @@
             m_inUpdate = true;
             m_editor = editor;
 
-            m_connection = editor.CurrentConnection;
             m_resourceId = null;
             m_serializeType = null;
             m_serializedObject = null;
@@ -543,13 +541,13 @@
 		{
 			if (m_serializeType != null)
 			{
-				m_serializedObject = m_connection.DeserializeObject(m_serializeType, new System.IO.MemoryStream(System.Text.Encoding.UTF8.GetBytes(textEditor.Text)) );
+                m_serializedObject = m_editor.CurrentConnection.DeserializeObject(m_serializeType, new System.IO.MemoryStream(System.Text.Encoding.UTF8.GetBytes(textEditor.Text)));
                 m_modified = false;
 				return false;
 			}
 			else
 			{
-                m_connection.SetResourceXmlData(savename, new System.IO.MemoryStream(System.Text.Encoding.UTF8.GetBytes(textEditor.Text)));
+                m_editor.CurrentConnection.SetResourceXmlData(savename, new System.IO.MemoryStream(System.Text.Encoding.UTF8.GetBytes(textEditor.Text)));
                 m_modified = false;
                 return true;
 			}

Modified: trunk/Tools/Maestro/MaestroAPI/ServerConnectionBase.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPI/ServerConnectionBase.cs	2009-08-30 13:18:59 UTC (rev 4200)
+++ trunk/Tools/Maestro/MaestroAPI/ServerConnectionBase.cs	2009-08-30 13:45:35 UTC (rev 4201)
@@ -1500,8 +1500,8 @@
 							if (sc.Prompt == null)
 								sc.Prompt = "";
 
-							if (sc.ResultColumns != null && sc.ResultColumns.Count == 0)
-								sc.ResultColumns = null;
+							if (sc.ResultColumns == null)
+								sc.ResultColumns = new ResultColumnTypeCollection();
 						}
 
 						if (cmd as InvokeURLCommandType != null)