[mapguide-commits] r6831 - in trunk/Tools/Maestro: Maestro.AddIn.Local OSGeo.MapGuide.MaestroAPI.Local OSGeo.MapGuide.MaestroAPI.Native

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-07-02 06:20:49 -0700 (Mon, 02 Jul 2012)
New Revision: 6831

Modified:
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgDesktop.dll
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeConnection.cs
Log:
Add patched MgDesktop.dll which includes fix for #2050, and fix MgClassDefinition to ClassDefinition conversion by housing the converted ClassDefinition inside a FeatureSchema where applicable thus preserving the qualified name

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgDesktop.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs	2012-07-02 12:51:20 UTC (rev 6830)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs	2012-07-02 13:20:49 UTC (rev 6831)
@@ -624,7 +624,10 @@
         protected override ClassDefinition GetClassDefinitionInternal(string resourceId, string schemaName, string className)
         {
             var cls = GetFeatureService().GetClassDefinition(new MgResourceIdentifier(resourceId), schemaName, className);
-            return Native.Utility.ConvertClassDefinition(cls);
+            var klass = Native.Utility.ConvertClassDefinition(cls);
+            var parent = new FeatureSchema(schemaName, "");
+            parent.AddClass(klass);
+            return klass;
         }
 
         public override Version SiteVersion

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeConnection.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeConnection.cs	2012-07-02 12:51:20 UTC (rev 6830)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Native/LocalNativeConnection.cs	2012-07-02 13:20:49 UTC (rev 6831)
@@ -1133,7 +1133,10 @@
         {
             var fsvc = (MgFeatureService)this.Connection.CreateService(MgServiceType.FeatureService);
             var cls = fsvc.GetClassDefinition(new MgResourceIdentifier(resourceId), schemaName, className);
-            return Native.Utility.ConvertClassDefinition(cls);
+            var klass = Native.Utility.ConvertClassDefinition(cls);
+            var parent = new FeatureSchema(schemaName, "");
+            parent.AddClass(klass);
+            return klass;
         }
 
         public override IServerConnection Clone()