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

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-02-12 22:51:44 -0800 (Sun, 12 Feb 2012)
New Revision: 6503

Modified:
   trunk/Tools/Maestro/Maestro.Base/Commands/ValidateEditedResourceCommand.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/DataPropertyDefinition.cs
Log:
This submission includes the following changes:
 - Handle XML editors differently when validating the current edited resource.
 - Use case-insensitive xsd data type comparisons when deserializing from xml

Modified: trunk/Tools/Maestro/Maestro.Base/Commands/ValidateEditedResourceCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/ValidateEditedResourceCommand.cs	2012-02-13 06:35:46 UTC (rev 6502)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/ValidateEditedResourceCommand.cs	2012-02-13 06:51:44 UTC (rev 6503)
@@ -29,6 +29,7 @@
 using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
 using Maestro.Shared.UI;
 using Maestro.Base.Services;
+using Maestro.Base.Editor;
 
 namespace Maestro.Base.Commands
 {
@@ -139,8 +140,16 @@
             {
                 _conn = ed.EditorService.GetEditedResource().CurrentConnection;
 
-                ed.EditorService.SyncSessionCopy();
-
+                var xed = ed as XmlEditor;
+                if (xed != null)
+                {
+                    xed.EditorService.UpdateResourceContent(xed.GetXmlContent());
+                }
+                else
+                {
+                    ed.EditorService.SyncSessionCopy();
+                }
+                
                 var pdlg = new ProgressDialog();
                 pdlg.CancelAbortsThread = true;
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/DataPropertyDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/DataPropertyDefinition.cs	2012-02-13 06:35:46 UTC (rev 6502)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/DataPropertyDefinition.cs	2012-02-13 06:51:44 UTC (rev 6503)
@@ -133,16 +133,16 @@
         /// <returns></returns>
         public static DataPropertyType GetDataType(string xmlType)
         {
-            switch (xmlType)
+            switch (xmlType.ToLower())
             {
                 case "xs:hexbinary":
-                case "xs:base64Binary":
+                case "xs:base64binary":
                     return DataPropertyType.Blob;
                 case "xs:boolean":
                     return DataPropertyType.Boolean;
                 case "fdo:byte":
                 case "xs:byte":
-                case "xs:unsignedByte":
+                case "xs:unsignedbyte":
                     return DataPropertyType.Byte;
                 case "xs:date":
                 case "xs:datetime":
@@ -155,22 +155,22 @@
                 case "fdo:int16":
                 case "xs:int16":
                 case "xs:short":
-                case "xs:unsignedShort":
+                case "xs:unsignedshort":
                     return DataPropertyType.Int16;
                 case "fdo:int32":
                 case "xs:int32":
                 case "xs:integer":
-                case "xs:negativeInteger":
-                case "xs:nonNegativeInteger":
-                case "xs:nonPositiveInteger":
-                case "xs:positiveInteger":
-                case "xs:unsignedInt":
+                case "xs:negativeinteger":
+                case "xs:nonnegativeinteger":
+                case "xs:nonpositiveinteger":
+                case "xs:positiveinteger":
+                case "xs:unsignedint":
                 case "xs:int":
                     return DataPropertyType.Int32;
                 case "fdo:int64":
                 case "xs:int64":
                 case "xs:long":
-                case "xs:unsignedLong":
+                case "xs:unsignedlong":
                     return DataPropertyType.Int64;
                 case "xs:float":
                 case "xs:single":