[mapguide-commits] r6139 - in trunk/Tools/Maestro: Maestro.Base/Services OSGeo.MapGuide.MaestroAPI/Schema

[svn_mapguide at osgeo.org]

Author: jng
Date: 2011-09-20 22:43:58 -0700 (Tue, 20 Sep 2011)
New Revision: 6139

Modified:
   trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/DataPropertyDefinition.cs
Log:
Add missing xsd schema data type introduced in latest MG trunk and fix a small defect where an editor which has been saved under a different resource name is still marked as "open" when closed

Modified: trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs	2011-09-20 16:52:32 UTC (rev 6138)
+++ trunk/Tools/Maestro/Maestro.Base/Services/OpenResourceManager.cs	2011-09-21 05:43:58 UTC (rev 6139)
@@ -176,7 +176,8 @@
                 };
                 ed.ViewContentClosed += (sender, e) =>
                 {
-                    _openItems.Remove(key);
+                    //Recompute the resource key as that may have changed by a save as operation
+                    _openItems.Remove(ComputeResourceKey(((EditorContentBase)sender).EditorService.ResourceID, conn));
                     siteExp.FlagNode(conn.DisplayName, ed.EditorService.ResourceID, NodeFlagAction.None);
                 };
                 ed.EditorService.Saved += (sender, e) =>

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/DataPropertyDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/DataPropertyDefinition.cs	2011-09-20 16:52:32 UTC (rev 6138)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/DataPropertyDefinition.cs	2011-09-21 05:43:58 UTC (rev 6139)
@@ -148,6 +148,7 @@
                     return DataPropertyType.Int32;
                 case "fdo:int64":
                 case "xs:int64":
+                case "xs:long":
                     return DataPropertyType.Int64;
                 case "xs:float":
                 case "xs:single":